[Mobies-commit] [commit] r3594 - in UDM/trunk: etc include src/UdmBase
endre at redhat1.isis.vanderbilt.edu
endre at redhat1.isis.vanderbilt.edu
Wed Jan 5 00:30:23 CST 2011
Author: endre
Date: Wed Jan 5 00:30:22 2011
New Revision: 3594
Log:
Regenerated UdmProject files.
Modified:
UDM/trunk/etc/UdmProject.xsd
UDM/trunk/etc/UdmProject_udm.xml
UDM/trunk/include/UdmProject.h
UDM/trunk/src/UdmBase/UdmProject.cpp
UDM/trunk/src/UdmBase/UdmProject_xsd.h
Modified: UDM/trunk/etc/UdmProject.xsd
==============================================================================
--- UDM/trunk/etc/UdmProject.xsd Tue Jan 4 16:19:30 2011 (r3593)
+++ UDM/trunk/etc/UdmProject.xsd Wed Jan 5 00:30:22 2011 (r3594)
@@ -3,15 +3,15 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Sun Feb 17 22:55:39 2008 -->
+<!-- generated on Fri Dec 31 08:14:15 2010 -->
<xsd:complexType name="DatanetworkType">
<xsd:attribute name="__child_as">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
- <xsd:enumeration value="instances"/>
<xsd:enumeration value="cross_associations"/>
+ <xsd:enumeration value="instances"/>
<xsd:enumeration value="crosslinks"/>
</xsd:restriction>
</xsd:simpleType>
@@ -31,6 +31,7 @@
<xsd:complexType name="ProjectType">
<xsd:sequence>
<xsd:element name="Datanetwork" type="DatanetworkType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="Project" type="ProjectType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="_id" type="xsd:ID"/>
@@ -40,6 +41,7 @@
<xsd:attribute name="_desynched_atts" type="xsd:string"/>
<xsd:attribute name="_real_archetype" type="xsd:boolean"/>
<xsd:attribute name="_subtype" type="xsd:boolean"/>
+ <xsd:attribute name="_libname" type="xsd:string"/>
</xsd:complexType>
<xsd:element name="Project" type="ProjectType"/>
Modified: UDM/trunk/etc/UdmProject_udm.xml
==============================================================================
--- UDM/trunk/etc/UdmProject_udm.xml Tue Jan 4 16:19:30 2011 (r3593)
+++ UDM/trunk/etc/UdmProject_udm.xml Wed Jan 5 00:30:22 2011 (r3594)
@@ -1,24 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Diagram name="UdmProject" version="1.00" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Uml.xsd">
- <Class _id="id5" name="Project" isAbstract="false" parentRoles="id6 id8 ida">
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id3" name="Datanetwork" childRoles="id4 id7 id9" isAbstract="false">
- <Attribute max="1" min="1" name="systemname" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="metaDgr" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="metalocator" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id4" max="1" min="0" name="cross_associations" target="id3" isNavigable="true"/>
- <CompositionParentRole _id="id6" target="id5" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id7" max="-1" min="0" name="instances" target="id3" isNavigable="true"/>
- <CompositionParentRole _id="id8" target="id5" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id9" max="1" min="0" name="crosslinks" target="id3" isNavigable="true"/>
- <CompositionParentRole _id="ida" target="id5" isNavigable="true"/>
- </Composition>
-</Diagram>
+ <Class _id="id5" isAbstract="false" name="Project" parentRoles="id6 id8 idA">
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Class _id="id3" childRoles="id4 id7 id9" isAbstract="false" name="Datanetwork">
+ <Attribute max="1" min="1" name="systemname" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="metaDgr" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="0" name="metalocator" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id4" isNavigable="true" max="1" min="0" name="cross_associations" target="id3"/>
+ <CompositionParentRole _id="id6" isNavigable="true" target="id5"/>
+ </Composition>
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id7" isNavigable="true" max="-1" min="0" name="instances" target="id3"/>
+ <CompositionParentRole _id="id8" isNavigable="true" target="id5"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id9" isNavigable="true" max="1" min="0" name="crosslinks" target="id3"/>
+ <CompositionParentRole _id="idA" isNavigable="true" target="id5"/>
+ </Composition>
+
+</Diagram>
Modified: UDM/trunk/include/UdmProject.h
==============================================================================
--- UDM/trunk/include/UdmProject.h Tue Jan 4 16:19:30 2011 (r3593)
+++ UDM/trunk/include/UdmProject.h Wed Jan 5 00:30:22 2011 (r3594)
@@ -2,18 +2,21 @@
#define MOBIES_UDMPROJECT_H
// header file UdmProject.h generated from diagram UdmProject
-// generated with Udm version 3.0 on Sun Feb 17 22:55:39 2008
+// generated with Udm version 3.27 on Fri Dec 31 08:14:15 2010
#include <UdmBase.h>
#if !defined(UDM_VERSION_MAJOR) || !defined(UDM_VERSION_MINOR)
# error "Udm headers too old, they do not define UDM_VERSION"
#elif UDM_VERSION_MAJOR < 3
-# error "Udm headers too old, minimum version required 3.0"
-#elif UDM_VERSION_MAJOR == 3 && UDM_VERSION_MINOR < 0
-# error "Udm headers too old, minimum version required 3.0"
+# error "Udm headers too old, minimum version required 3.27"
+#elif UDM_VERSION_MAJOR == 3 && UDM_VERSION_MINOR < 27
+# error "Udm headers too old, minimum version required 3.27"
#endif
+#include <Uml.h>
+
+
#ifdef min
#undef min
#endif
@@ -37,7 +40,12 @@
Datanetwork() {}
Datanetwork(Udm::ObjectImpl *impl) : UDM_OBJECT(impl) {}
Datanetwork(const Datanetwork &master) : UDM_OBJECT(master) {}
+ #ifdef UDM_RVALUE
+ Datanetwork(Datanetwork &&master) : UDM_OBJECT(master) {}
+ static Datanetwork Cast(Udm::Object &&a) { return __Cast(a, meta); }
+ Datanetwork& operator=(Datanetwork &&a) { Udm::Object::operator =(a); return *this; }
+ #endif
static Datanetwork Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Datanetwork Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
Datanetwork CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
@@ -50,8 +58,8 @@
Udm::StringAttr metaDgr() const { return Udm::StringAttr(impl, meta_metaDgr); }
Udm::StringAttr systemname() const { return Udm::StringAttr(impl, meta_systemname); }
Udm::StringAttr metalocator() const { return Udm::StringAttr(impl, meta_metalocator); }
- Udm::ParentAttr< ::UdmProject::Project> instances_Project_parent() const { return Udm::ParentAttr< ::UdmProject::Project>(impl, meta_instances_Project_parent); }
Udm::ParentAttr< ::UdmProject::Project> cross_associations_Project_parent() const { return Udm::ParentAttr< ::UdmProject::Project>(impl, meta_cross_associations_Project_parent); }
+ Udm::ParentAttr< ::UdmProject::Project> instances_Project_parent() const { return Udm::ParentAttr< ::UdmProject::Project>(impl, meta_instances_Project_parent); }
Udm::ParentAttr< ::UdmProject::Project> crosslinks_Project_parent() const { return Udm::ParentAttr< ::UdmProject::Project>(impl, meta_crosslinks_Project_parent); }
Udm::ParentAttr< ::UdmProject::Project> parent() const { return Udm::ParentAttr< ::UdmProject::Project>(impl, Udm::NULLPARENTROLE); }
@@ -59,8 +67,8 @@
static ::Uml::Attribute meta_metaDgr;
static ::Uml::Attribute meta_systemname;
static ::Uml::Attribute meta_metalocator;
- static ::Uml::CompositionParentRole meta_instances_Project_parent;
static ::Uml::CompositionParentRole meta_cross_associations_Project_parent;
+ static ::Uml::CompositionParentRole meta_instances_Project_parent;
static ::Uml::CompositionParentRole meta_crosslinks_Project_parent;
};
@@ -70,7 +78,12 @@
Project() {}
Project(Udm::ObjectImpl *impl) : UDM_OBJECT(impl) {}
Project(const Project &master) : UDM_OBJECT(master) {}
+ #ifdef UDM_RVALUE
+ Project(Project &&master) : UDM_OBJECT(master) {}
+ static Project Cast(Udm::Object &&a) { return __Cast(a, meta); }
+ Project& operator=(Project &&a) { Udm::Object::operator =(a); return *this; }
+ #endif
static Project Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Project Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
Project CreateInstance(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role, impl); }
@@ -81,9 +94,9 @@
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); }
Udm::StringAttr name() const { return Udm::StringAttr(impl, meta_name); }
+ Udm::ChildAttr< ::UdmProject::Datanetwork> cross_associations() const { return Udm::ChildAttr< ::UdmProject::Datanetwork>(impl, meta_cross_associations); }
Udm::ChildrenAttr< ::UdmProject::Datanetwork> instances() const { return Udm::ChildrenAttr< ::UdmProject::Datanetwork>(impl, meta_instances); }
template <class Pred> Udm::ChildrenAttr< ::UdmProject::Datanetwork, Pred> instances_sorted(const Pred &) const { return Udm::ChildrenAttr< ::UdmProject::Datanetwork, Pred>(impl, meta_instances); }
- Udm::ChildAttr< ::UdmProject::Datanetwork> cross_associations() const { return Udm::ChildAttr< ::UdmProject::Datanetwork>(impl, meta_cross_associations); }
Udm::ChildAttr< ::UdmProject::Datanetwork> crosslinks() const { return Udm::ChildAttr< ::UdmProject::Datanetwork>(impl, meta_crosslinks); }
Udm::ChildrenAttr< ::UdmProject::Datanetwork> Datanetwork_kind_children() const { return Udm::ChildrenAttr< ::UdmProject::Datanetwork>(impl, Udm::NULLCHILDROLE); }
template <class Pred> Udm::ChildrenAttr< ::UdmProject::Datanetwork, Pred> Datanetwork_kind_children_sorted(const Pred &) const { return Udm::ChildrenAttr< ::UdmProject::Datanetwork, Pred>(impl, Udm::NULLCHILDROLE); }
@@ -91,8 +104,8 @@
static ::Uml::Class meta;
static ::Uml::Attribute meta_name;
- static ::Uml::CompositionChildRole meta_instances;
static ::Uml::CompositionChildRole meta_cross_associations;
+ static ::Uml::CompositionChildRole meta_instances;
static ::Uml::CompositionChildRole meta_crosslinks;
};
Modified: UDM/trunk/src/UdmBase/UdmProject.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject.cpp Tue Jan 4 16:19:30 2011 (r3593)
+++ UDM/trunk/src/UdmBase/UdmProject.cpp Wed Jan 5 00:30:22 2011 (r3594)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file UdmProject.cpp
// generated from diagram UdmProject
-// generated on Sun Feb 17 22:55:39 2008
+// generated on Fri Dec 31 08:14:15 2010
#include "UdmProject.h"
#include <UmlExt.h>
@@ -15,14 +15,14 @@
::Uml::Attribute Datanetwork::meta_metaDgr;
::Uml::Attribute Datanetwork::meta_systemname;
::Uml::Attribute Datanetwork::meta_metalocator;
- ::Uml::CompositionParentRole Datanetwork::meta_instances_Project_parent;
::Uml::CompositionParentRole Datanetwork::meta_cross_associations_Project_parent;
+ ::Uml::CompositionParentRole Datanetwork::meta_instances_Project_parent;
::Uml::CompositionParentRole Datanetwork::meta_crosslinks_Project_parent;
::Uml::Class Project::meta;
::Uml::Attribute Project::meta_name;
- ::Uml::CompositionChildRole Project::meta_instances;
::Uml::CompositionChildRole Project::meta_cross_associations;
+ ::Uml::CompositionChildRole Project::meta_instances;
::Uml::CompositionChildRole Project::meta_crosslinks;
::Uml::Diagram meta;
@@ -37,10 +37,10 @@
Project::meta = ::Uml::CreateClass();
Project::meta_name = ::Uml::CreateAttribute();
- Datanetwork::meta_instances_Project_parent = ::Uml::CreateCompositionParentRole();
- Project::meta_instances = ::Uml::CreateCompositionChildRole();
Datanetwork::meta_cross_associations_Project_parent = ::Uml::CreateCompositionParentRole();
Project::meta_cross_associations = ::Uml::CreateCompositionChildRole();
+ Datanetwork::meta_instances_Project_parent = ::Uml::CreateCompositionParentRole();
+ Project::meta_instances = ::Uml::CreateCompositionChildRole();
Datanetwork::meta_crosslinks_Project_parent = ::Uml::CreateCompositionParentRole();
Project::meta_crosslinks = ::Uml::CreateCompositionChildRole();
@@ -63,15 +63,15 @@
{
::Uml::Composition comp = ::Uml::CreateComposition();
::Uml::InitComposition(comp, meta, "Composition");
- ::Uml::InitCompositionParentRole(Datanetwork::meta_instances_Project_parent, comp, "instances_Project_parent", true, Project::meta);
- ::Uml::InitCompositionChildRole(Project::meta_instances, comp, "instances", true, 0, -1, Datanetwork::meta);
+ ::Uml::InitCompositionParentRole(Datanetwork::meta_cross_associations_Project_parent, comp, "cross_associations_Project_parent", true, Project::meta);
+ ::Uml::InitCompositionChildRole(Project::meta_cross_associations, comp, "cross_associations", true, 0, 1, Datanetwork::meta);
}
{
::Uml::Composition comp = ::Uml::CreateComposition();
::Uml::InitComposition(comp, meta, "Composition");
- ::Uml::InitCompositionParentRole(Datanetwork::meta_cross_associations_Project_parent, comp, "cross_associations_Project_parent", true, Project::meta);
- ::Uml::InitCompositionChildRole(Project::meta_cross_associations, comp, "cross_associations", true, 0, 1, Datanetwork::meta);
+ ::Uml::InitCompositionParentRole(Datanetwork::meta_instances_Project_parent, comp, "instances_Project_parent", true, Project::meta);
+ ::Uml::InitCompositionChildRole(Project::meta_instances, comp, "instances", true, 0, -1, Datanetwork::meta);
}
{
Modified: UDM/trunk/src/UdmBase/UdmProject_xsd.h
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject_xsd.h Tue Jan 4 16:19:30 2011 (r3593)
+++ UDM/trunk/src/UdmBase/UdmProject_xsd.h Wed Jan 5 00:30:22 2011 (r3594)
@@ -15,15 +15,15 @@
str +="<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n";
str +=" elementFormDefault=\"qualified\" \n";
str +=">\n";
- str +="<!-- generated on Sun Feb 17 22:55:39 2008 -->\n";
+// str +="<!-- generated on Fri Dec 31 08:14:15 2010 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"DatanetworkType\">\n";
str +=" <xsd:attribute name=\"__child_as\">\n";
str +=" <xsd:simpleType>\n";
str +=" <xsd:restriction base=\"xsd:string\">\n";
- str +=" <xsd:enumeration value=\"instances\"/>\n";
str +=" <xsd:enumeration value=\"cross_associations\"/>\n";
+ str +=" <xsd:enumeration value=\"instances\"/>\n";
str +=" <xsd:enumeration value=\"crosslinks\"/>\n";
str +=" </xsd:restriction>\n";
str +=" </xsd:simpleType>\n";
@@ -43,6 +43,7 @@
str +=" <xsd:complexType name=\"ProjectType\">\n";
str +=" <xsd:sequence>\n";
str +=" <xsd:element name=\"Datanetwork\" type=\"DatanetworkType\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>\n";
+ str +=" <xsd:element name=\"Project\" type=\"ProjectType\" minOccurs=\"0\" maxOccurs=\"unbounded\"/>\n";
str +=" </xsd:sequence>\n";
str +=" <xsd:attribute name=\"name\" type=\"xsd:string\" use=\"required\"/>\n";
str +=" <xsd:attribute name=\"_id\" type=\"xsd:ID\"/>\n";
@@ -52,6 +53,7 @@
str +=" <xsd:attribute name=\"_desynched_atts\" type=\"xsd:string\"/>\n";
str +=" <xsd:attribute name=\"_real_archetype\" type=\"xsd:boolean\"/>\n";
str +=" <xsd:attribute name=\"_subtype\" type=\"xsd:boolean\"/>\n";
+ str +=" <xsd:attribute name=\"_libname\" type=\"xsd:string\"/>\n";
str +=" </xsd:complexType>\n";
str +="\n";
str +=" <xsd:element name=\"Project\" type=\"ProjectType\"/>\n";
More information about the Mobies-commit
mailing list