[Mobies-commit] [commit] r3651 - in UDM/trunk: etc include src/Udm src/UdmBase src/Uml
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Mon Mar 7 10:38:20 CST 2011
Author: ksmyth
Date: Mon Mar 7 10:38:19 2011
New Revision: 3651
Log:
Fix UDM-77: CreateDerived code created an instance
Modified:
UDM/trunk/etc/UdmProject.xsd
UDM/trunk/include/UdmProject.h
UDM/trunk/include/Uml.h
UDM/trunk/src/Udm/ClassGen.cpp
UDM/trunk/src/UdmBase/UdmProject.cpp
UDM/trunk/src/UdmBase/UdmProject_xsd.h
UDM/trunk/src/Uml/Uml.cpp
UDM/trunk/src/Uml/Uml.h
UDM/trunk/src/Uml/Uml.xsd
UDM/trunk/src/Uml/Uml_xsd.h
Modified: UDM/trunk/etc/UdmProject.xsd
==============================================================================
--- UDM/trunk/etc/UdmProject.xsd Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/etc/UdmProject.xsd Mon Mar 7 10:38:19 2011 (r3651)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Mon Jan 24 23:17:28 2011 -->
+<!-- generated on Mon Mar 07 10:31:53 2011 -->
<xsd:complexType name="DatanetworkType">
Modified: UDM/trunk/include/UdmProject.h
==============================================================================
--- UDM/trunk/include/UdmProject.h Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/include/UdmProject.h Mon Mar 7 10:38:19 2011 (r3651)
@@ -2,7 +2,7 @@
#define MOBIES_UDMPROJECT_H
// header file UdmProject.h generated from diagram UdmProject
-// generated with Udm version 3.27 on Mon Jan 24 23:17:28 2011
+// generated with Udm version 3.27 on Mon Mar 07 10:31:53 2011
#include <UdmBase.h>
@@ -51,7 +51,7 @@
Datanetwork CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Datanetwork> Instances() { return Udm::InstantiatedAttr<Datanetwork>(impl); }
template <class Pred> Udm::InstantiatedAttr<Datanetwork, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Datanetwork, Pred>(impl); }
- Datanetwork CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Datanetwork CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Datanetwork> Derived() { return Udm::DerivedAttr<Datanetwork>(impl); }
template <class Pred> Udm::DerivedAttr<Datanetwork, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Datanetwork, Pred>(impl); }
Udm::ArchetypeAttr<Datanetwork> Archetype() const { return Udm::ArchetypeAttr<Datanetwork>(impl); }
@@ -89,7 +89,7 @@
Project CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Project> Instances() { return Udm::InstantiatedAttr<Project>(impl); }
template <class Pred> Udm::InstantiatedAttr<Project, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Project, Pred>(impl); }
- Project CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Project CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Project> Derived() { return Udm::DerivedAttr<Project>(impl); }
template <class Pred> Udm::DerivedAttr<Project, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Project, Pred>(impl); }
Udm::ArchetypeAttr<Project> Archetype() const { return Udm::ArchetypeAttr<Project>(impl); }
Modified: UDM/trunk/include/Uml.h
==============================================================================
--- UDM/trunk/include/Uml.h Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/include/Uml.h Mon Mar 7 10:38:19 2011 (r3651)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Mon Jan 24 23:17:31 2011
+// generated with Udm version 3.27 on Mon Mar 07 10:31:53 2011
#include <UdmBase.h>
@@ -64,7 +64,7 @@
GenericRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<GenericRole> Instances() { return Udm::InstantiatedAttr<GenericRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<GenericRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<GenericRole, Pred>(impl); }
- GenericRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ GenericRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<GenericRole> Derived() { return Udm::DerivedAttr<GenericRole>(impl); }
template <class Pred> Udm::DerivedAttr<GenericRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<GenericRole, Pred>(impl); }
Udm::ArchetypeAttr<GenericRole> Archetype() const { return Udm::ArchetypeAttr<GenericRole>(impl); }
@@ -94,7 +94,7 @@
CompositionChildRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<CompositionChildRole> Instances() { return Udm::InstantiatedAttr<CompositionChildRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<CompositionChildRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<CompositionChildRole, Pred>(impl); }
- CompositionChildRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ CompositionChildRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<CompositionChildRole> Derived() { return Udm::DerivedAttr<CompositionChildRole>(impl); }
template <class Pred> Udm::DerivedAttr<CompositionChildRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<CompositionChildRole, Pred>(impl); }
Udm::ArchetypeAttr<CompositionChildRole> Archetype() const { return Udm::ArchetypeAttr<CompositionChildRole>(impl); }
@@ -127,7 +127,7 @@
CompositionParentRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<CompositionParentRole> Instances() { return Udm::InstantiatedAttr<CompositionParentRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<CompositionParentRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<CompositionParentRole, Pred>(impl); }
- CompositionParentRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ CompositionParentRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<CompositionParentRole> Derived() { return Udm::DerivedAttr<CompositionParentRole>(impl); }
template <class Pred> Udm::DerivedAttr<CompositionParentRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<CompositionParentRole, Pred>(impl); }
Udm::ArchetypeAttr<CompositionParentRole> Archetype() const { return Udm::ArchetypeAttr<CompositionParentRole>(impl); }
@@ -156,7 +156,7 @@
AssociationRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<AssociationRole> Instances() { return Udm::InstantiatedAttr<AssociationRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<AssociationRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<AssociationRole, Pred>(impl); }
- AssociationRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ AssociationRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<AssociationRole> Derived() { return Udm::DerivedAttr<AssociationRole>(impl); }
template <class Pred> Udm::DerivedAttr<AssociationRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<AssociationRole, Pred>(impl); }
Udm::ArchetypeAttr<AssociationRole> Archetype() const { return Udm::ArchetypeAttr<AssociationRole>(impl); }
@@ -195,7 +195,7 @@
Class CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Class> Instances() { return Udm::InstantiatedAttr<Class>(impl); }
template <class Pred> Udm::InstantiatedAttr<Class, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Class, Pred>(impl); }
- Class CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Class CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Class> Derived() { return Udm::DerivedAttr<Class>(impl); }
template <class Pred> Udm::DerivedAttr<Class, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Class, Pred>(impl); }
Udm::ArchetypeAttr<Class> Archetype() const { return Udm::ArchetypeAttr<Class>(impl); }
@@ -269,7 +269,7 @@
Diagram CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Diagram> Instances() { return Udm::InstantiatedAttr<Diagram>(impl); }
template <class Pred> Udm::InstantiatedAttr<Diagram, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Diagram, Pred>(impl); }
- Diagram CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Diagram CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Diagram> Derived() { return Udm::DerivedAttr<Diagram>(impl); }
template <class Pred> Udm::DerivedAttr<Diagram, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Diagram, Pred>(impl); }
Udm::ArchetypeAttr<Diagram> Archetype() const { return Udm::ArchetypeAttr<Diagram>(impl); }
@@ -319,7 +319,7 @@
Association CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Association> Instances() { return Udm::InstantiatedAttr<Association>(impl); }
template <class Pred> Udm::InstantiatedAttr<Association, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Association, Pred>(impl); }
- Association CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Association CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Association> Derived() { return Udm::DerivedAttr<Association>(impl); }
template <class Pred> Udm::DerivedAttr<Association, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Association, Pred>(impl); }
Udm::ArchetypeAttr<Association> Archetype() const { return Udm::ArchetypeAttr<Association>(impl); }
@@ -366,7 +366,7 @@
Composition CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Composition> Instances() { return Udm::InstantiatedAttr<Composition>(impl); }
template <class Pred> Udm::InstantiatedAttr<Composition, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Composition, Pred>(impl); }
- Composition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Composition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Composition> Derived() { return Udm::DerivedAttr<Composition>(impl); }
template <class Pred> Udm::DerivedAttr<Composition, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Composition, Pred>(impl); }
Udm::ArchetypeAttr<Composition> Archetype() const { return Udm::ArchetypeAttr<Composition>(impl); }
@@ -409,7 +409,7 @@
Namespace CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Namespace> Instances() { return Udm::InstantiatedAttr<Namespace>(impl); }
template <class Pred> Udm::InstantiatedAttr<Namespace, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Namespace, Pred>(impl); }
- Namespace CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Namespace CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Namespace> Derived() { return Udm::DerivedAttr<Namespace>(impl); }
template <class Pred> Udm::DerivedAttr<Namespace, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Namespace, Pred>(impl); }
Udm::ArchetypeAttr<Namespace> Archetype() const { return Udm::ArchetypeAttr<Namespace>(impl); }
@@ -460,7 +460,7 @@
TaggedValue CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<TaggedValue> Instances() { return Udm::InstantiatedAttr<TaggedValue>(impl); }
template <class Pred> Udm::InstantiatedAttr<TaggedValue, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<TaggedValue, Pred>(impl); }
- TaggedValue CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ TaggedValue CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<TaggedValue> Derived() { return Udm::DerivedAttr<TaggedValue>(impl); }
template <class Pred> Udm::DerivedAttr<TaggedValue, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<TaggedValue, Pred>(impl); }
Udm::ArchetypeAttr<TaggedValue> Archetype() const { return Udm::ArchetypeAttr<TaggedValue>(impl); }
@@ -494,7 +494,7 @@
ConstraintDefinition CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<ConstraintDefinition> Instances() { return Udm::InstantiatedAttr<ConstraintDefinition>(impl); }
template <class Pred> Udm::InstantiatedAttr<ConstraintDefinition, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<ConstraintDefinition, Pred>(impl); }
- ConstraintDefinition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ ConstraintDefinition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<ConstraintDefinition> Derived() { return Udm::DerivedAttr<ConstraintDefinition>(impl); }
template <class Pred> Udm::DerivedAttr<ConstraintDefinition, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<ConstraintDefinition, Pred>(impl); }
Udm::ArchetypeAttr<ConstraintDefinition> Archetype() const { return Udm::ArchetypeAttr<ConstraintDefinition>(impl); }
@@ -531,7 +531,7 @@
Attribute CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Attribute> Instances() { return Udm::InstantiatedAttr<Attribute>(impl); }
template <class Pred> Udm::InstantiatedAttr<Attribute, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Attribute, Pred>(impl); }
- Attribute CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Attribute CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Attribute> Derived() { return Udm::DerivedAttr<Attribute>(impl); }
template <class Pred> Udm::DerivedAttr<Attribute, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Attribute, Pred>(impl); }
Udm::ArchetypeAttr<Attribute> Archetype() const { return Udm::ArchetypeAttr<Attribute>(impl); }
@@ -576,7 +576,7 @@
Constraint CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Constraint> Instances() { return Udm::InstantiatedAttr<Constraint>(impl); }
template <class Pred> Udm::InstantiatedAttr<Constraint, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Constraint, Pred>(impl); }
- Constraint CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Constraint CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Constraint> Derived() { return Udm::DerivedAttr<Constraint>(impl); }
template <class Pred> Udm::DerivedAttr<Constraint, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Constraint, Pred>(impl); }
Udm::ArchetypeAttr<Constraint> Archetype() const { return Udm::ArchetypeAttr<Constraint>(impl); }
Modified: UDM/trunk/src/Udm/ClassGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/ClassGen.cpp Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/src/Udm/ClassGen.cpp Mon Mar 7 10:38:19 2011 (r3651)
@@ -155,8 +155,8 @@
// template <class Pred> Udm::InstantiatedAttr<C, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<C, Pred>(impl); }
meth_defs.push_back( boost::format("template <class Pred> Udm::InstantiatedAttr<%1%, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<%1%, Pred>(impl); }") % cl_name );
- // C CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
- meth_defs.push_back( boost::format("%1% CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }") % cl_name );
+ // C CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
+ meth_defs.push_back( boost::format("%1% CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }") % cl_name );
// Udm::DerivedAttr<C> Derived() { return Udm::DerivedAttr<C>(impl); }
meth_defs.push_back( boost::format("Udm::DerivedAttr<%1%> Derived() { return Udm::DerivedAttr<%1%>(impl); }") % cl_name );
Modified: UDM/trunk/src/UdmBase/UdmProject.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject.cpp Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/src/UdmBase/UdmProject.cpp Mon Mar 7 10:38:19 2011 (r3651)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file UdmProject.cpp
// generated from diagram UdmProject
-// generated on Mon Jan 24 23:17:28 2011
+// generated on Mon Mar 07 10:31:53 2011
#include "UdmProject.h"
#include <UmlExt.h>
Modified: UDM/trunk/src/UdmBase/UdmProject_xsd.h
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject_xsd.h Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/src/UdmBase/UdmProject_xsd.h Mon Mar 7 10:38:19 2011 (r3651)
@@ -15,7 +15,7 @@
str +="<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n";
str +=" elementFormDefault=\"qualified\" \n";
str +=">\n";
-// str +="<!-- generated on Mon Jan 24 23:17:28 2011 -->\n";
+// str +="<!-- generated on Mon Mar 07 10:31:53 2011 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"DatanetworkType\">\n";
Modified: UDM/trunk/src/Uml/Uml.cpp
==============================================================================
--- UDM/trunk/src/Uml/Uml.cpp Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/src/Uml/Uml.cpp Mon Mar 7 10:38:19 2011 (r3651)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file Uml.cpp
// generated from diagram Uml
-// generated on Mon Jan 24 23:17:31 2011
+// generated on Mon Mar 07 10:31:53 2011
#include "Uml.h"
#include <UmlExt.h>
Modified: UDM/trunk/src/Uml/Uml.h
==============================================================================
--- UDM/trunk/src/Uml/Uml.h Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/src/Uml/Uml.h Mon Mar 7 10:38:19 2011 (r3651)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Mon Jan 24 23:17:31 2011
+// generated with Udm version 3.27 on Mon Mar 07 10:31:53 2011
#include <UdmBase.h>
@@ -64,7 +64,7 @@
GenericRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<GenericRole> Instances() { return Udm::InstantiatedAttr<GenericRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<GenericRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<GenericRole, Pred>(impl); }
- GenericRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ GenericRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<GenericRole> Derived() { return Udm::DerivedAttr<GenericRole>(impl); }
template <class Pred> Udm::DerivedAttr<GenericRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<GenericRole, Pred>(impl); }
Udm::ArchetypeAttr<GenericRole> Archetype() const { return Udm::ArchetypeAttr<GenericRole>(impl); }
@@ -94,7 +94,7 @@
CompositionChildRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<CompositionChildRole> Instances() { return Udm::InstantiatedAttr<CompositionChildRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<CompositionChildRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<CompositionChildRole, Pred>(impl); }
- CompositionChildRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ CompositionChildRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<CompositionChildRole> Derived() { return Udm::DerivedAttr<CompositionChildRole>(impl); }
template <class Pred> Udm::DerivedAttr<CompositionChildRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<CompositionChildRole, Pred>(impl); }
Udm::ArchetypeAttr<CompositionChildRole> Archetype() const { return Udm::ArchetypeAttr<CompositionChildRole>(impl); }
@@ -127,7 +127,7 @@
CompositionParentRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<CompositionParentRole> Instances() { return Udm::InstantiatedAttr<CompositionParentRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<CompositionParentRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<CompositionParentRole, Pred>(impl); }
- CompositionParentRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ CompositionParentRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<CompositionParentRole> Derived() { return Udm::DerivedAttr<CompositionParentRole>(impl); }
template <class Pred> Udm::DerivedAttr<CompositionParentRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<CompositionParentRole, Pred>(impl); }
Udm::ArchetypeAttr<CompositionParentRole> Archetype() const { return Udm::ArchetypeAttr<CompositionParentRole>(impl); }
@@ -156,7 +156,7 @@
AssociationRole CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<AssociationRole> Instances() { return Udm::InstantiatedAttr<AssociationRole>(impl); }
template <class Pred> Udm::InstantiatedAttr<AssociationRole, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<AssociationRole, Pred>(impl); }
- AssociationRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ AssociationRole CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<AssociationRole> Derived() { return Udm::DerivedAttr<AssociationRole>(impl); }
template <class Pred> Udm::DerivedAttr<AssociationRole, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<AssociationRole, Pred>(impl); }
Udm::ArchetypeAttr<AssociationRole> Archetype() const { return Udm::ArchetypeAttr<AssociationRole>(impl); }
@@ -195,7 +195,7 @@
Class CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Class> Instances() { return Udm::InstantiatedAttr<Class>(impl); }
template <class Pred> Udm::InstantiatedAttr<Class, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Class, Pred>(impl); }
- Class CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Class CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Class> Derived() { return Udm::DerivedAttr<Class>(impl); }
template <class Pred> Udm::DerivedAttr<Class, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Class, Pred>(impl); }
Udm::ArchetypeAttr<Class> Archetype() const { return Udm::ArchetypeAttr<Class>(impl); }
@@ -269,7 +269,7 @@
Diagram CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Diagram> Instances() { return Udm::InstantiatedAttr<Diagram>(impl); }
template <class Pred> Udm::InstantiatedAttr<Diagram, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Diagram, Pred>(impl); }
- Diagram CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Diagram CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Diagram> Derived() { return Udm::DerivedAttr<Diagram>(impl); }
template <class Pred> Udm::DerivedAttr<Diagram, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Diagram, Pred>(impl); }
Udm::ArchetypeAttr<Diagram> Archetype() const { return Udm::ArchetypeAttr<Diagram>(impl); }
@@ -319,7 +319,7 @@
Association CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Association> Instances() { return Udm::InstantiatedAttr<Association>(impl); }
template <class Pred> Udm::InstantiatedAttr<Association, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Association, Pred>(impl); }
- Association CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Association CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Association> Derived() { return Udm::DerivedAttr<Association>(impl); }
template <class Pred> Udm::DerivedAttr<Association, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Association, Pred>(impl); }
Udm::ArchetypeAttr<Association> Archetype() const { return Udm::ArchetypeAttr<Association>(impl); }
@@ -366,7 +366,7 @@
Composition CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Composition> Instances() { return Udm::InstantiatedAttr<Composition>(impl); }
template <class Pred> Udm::InstantiatedAttr<Composition, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Composition, Pred>(impl); }
- Composition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Composition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Composition> Derived() { return Udm::DerivedAttr<Composition>(impl); }
template <class Pred> Udm::DerivedAttr<Composition, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Composition, Pred>(impl); }
Udm::ArchetypeAttr<Composition> Archetype() const { return Udm::ArchetypeAttr<Composition>(impl); }
@@ -409,7 +409,7 @@
Namespace CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Namespace> Instances() { return Udm::InstantiatedAttr<Namespace>(impl); }
template <class Pred> Udm::InstantiatedAttr<Namespace, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Namespace, Pred>(impl); }
- Namespace CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Namespace CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Namespace> Derived() { return Udm::DerivedAttr<Namespace>(impl); }
template <class Pred> Udm::DerivedAttr<Namespace, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Namespace, Pred>(impl); }
Udm::ArchetypeAttr<Namespace> Archetype() const { return Udm::ArchetypeAttr<Namespace>(impl); }
@@ -460,7 +460,7 @@
TaggedValue CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<TaggedValue> Instances() { return Udm::InstantiatedAttr<TaggedValue>(impl); }
template <class Pred> Udm::InstantiatedAttr<TaggedValue, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<TaggedValue, Pred>(impl); }
- TaggedValue CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ TaggedValue CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<TaggedValue> Derived() { return Udm::DerivedAttr<TaggedValue>(impl); }
template <class Pred> Udm::DerivedAttr<TaggedValue, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<TaggedValue, Pred>(impl); }
Udm::ArchetypeAttr<TaggedValue> Archetype() const { return Udm::ArchetypeAttr<TaggedValue>(impl); }
@@ -494,7 +494,7 @@
ConstraintDefinition CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<ConstraintDefinition> Instances() { return Udm::InstantiatedAttr<ConstraintDefinition>(impl); }
template <class Pred> Udm::InstantiatedAttr<ConstraintDefinition, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<ConstraintDefinition, Pred>(impl); }
- ConstraintDefinition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ ConstraintDefinition CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<ConstraintDefinition> Derived() { return Udm::DerivedAttr<ConstraintDefinition>(impl); }
template <class Pred> Udm::DerivedAttr<ConstraintDefinition, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<ConstraintDefinition, Pred>(impl); }
Udm::ArchetypeAttr<ConstraintDefinition> Archetype() const { return Udm::ArchetypeAttr<ConstraintDefinition>(impl); }
@@ -531,7 +531,7 @@
Attribute CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Attribute> Instances() { return Udm::InstantiatedAttr<Attribute>(impl); }
template <class Pred> Udm::InstantiatedAttr<Attribute, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Attribute, Pred>(impl); }
- Attribute CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Attribute CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Attribute> Derived() { return Udm::DerivedAttr<Attribute>(impl); }
template <class Pred> Udm::DerivedAttr<Attribute, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Attribute, Pred>(impl); }
Udm::ArchetypeAttr<Attribute> Archetype() const { return Udm::ArchetypeAttr<Attribute>(impl); }
@@ -576,7 +576,7 @@
Constraint CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
Udm::InstantiatedAttr<Constraint> Instances() { return Udm::InstantiatedAttr<Constraint>(impl); }
template <class Pred> Udm::InstantiatedAttr<Constraint, Pred> Instances_sorted(const Pred &) { return Udm::InstantiatedAttr<Constraint, Pred>(impl); }
- Constraint CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
+ Constraint CreateDerived(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl, true); }
Udm::DerivedAttr<Constraint> Derived() { return Udm::DerivedAttr<Constraint>(impl); }
template <class Pred> Udm::DerivedAttr<Constraint, Pred> Derived_sorted(const Pred &) { return Udm::DerivedAttr<Constraint, Pred>(impl); }
Udm::ArchetypeAttr<Constraint> Archetype() const { return Udm::ArchetypeAttr<Constraint>(impl); }
Modified: UDM/trunk/src/Uml/Uml.xsd
==============================================================================
--- UDM/trunk/src/Uml/Uml.xsd Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/src/Uml/Uml.xsd Mon Mar 7 10:38:19 2011 (r3651)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Mon Jan 24 23:17:29 2011 -->
+<!-- generated on Mon Mar 07 10:31:53 2011 -->
<xsd:complexType name="CompositionChildRoleType">
Modified: UDM/trunk/src/Uml/Uml_xsd.h
==============================================================================
--- UDM/trunk/src/Uml/Uml_xsd.h Thu Mar 3 02:53:58 2011 (r3650)
+++ UDM/trunk/src/Uml/Uml_xsd.h Mon Mar 7 10:38:19 2011 (r3651)
@@ -15,7 +15,7 @@
str +="<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n";
str +=" elementFormDefault=\"qualified\" \n";
str +=">\n";
-// str +="<!-- generated on Mon Jan 24 23:17:29 2011 -->\n";
+// str +="<!-- generated on Mon Mar 07 10:31:53 2011 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"CompositionChildRoleType\">\n";
More information about the Mobies-commit
mailing list