[Mobies-commit] [commit] r3613 - in UDM/trunk: etc include src/Udm src/UdmBase src/Uml
endre at redhat1.isis.vanderbilt.edu
endre at redhat1.isis.vanderbilt.edu
Mon Jan 24 15:24:03 CST 2011
Author: endre
Date: Mon Jan 24 15:24:02 2011
New Revision: 3613
Log:
changed the code generator such that the generated Uml.h/Uml.cpp does not have the memory leak issue anymore.
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/Udm/DiagramGen.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 Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/etc/UdmProject.xsd Mon Jan 24 15:24:02 2011 (r3613)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Sun Jan 23 02:22:25 2011 -->
+<!-- generated on Mon Jan 24 23:17:28 2011 -->
<xsd:complexType name="DatanetworkType">
Modified: UDM/trunk/include/UdmProject.h
==============================================================================
--- UDM/trunk/include/UdmProject.h Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/include/UdmProject.h Mon Jan 24 15:24:02 2011 (r3613)
@@ -2,7 +2,7 @@
#define MOBIES_UDMPROJECT_H
// header file UdmProject.h generated from diagram UdmProject
-// generated with Udm version 3.27 on Sun Jan 23 02:22:25 2011
+// generated with Udm version 3.27 on Mon Jan 24 23:17:28 2011
#include <UdmBase.h>
Modified: UDM/trunk/include/Uml.h
==============================================================================
--- UDM/trunk/include/Uml.h Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/include/Uml.h Mon Jan 24 15:24:02 2011 (r3613)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Sun Jan 23 02:22:28 2011
+// generated with Udm version 3.27 on Mon Jan 24 23:17:31 2011
#include <UdmBase.h>
Modified: UDM/trunk/src/Udm/ClassGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/ClassGen.cpp Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/Udm/ClassGen.cpp Mon Jan 24 15:24:02 2011 (r3613)
@@ -938,7 +938,6 @@
meta_init_links.push_back( boost::format("%1%::meta_%2%_end_.rp_helper() = %1%::meta_%3%") % cl_name % orel_name % orp_helper_name );
}
-
if (gen.opts.mode == UdmOpts::CXX_GENERIC)
{
aclass_tlhlp.roles2type.push_back( boost::format("class ACE_%1% {}") % rel_name );
Modified: UDM/trunk/src/Udm/DiagramGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/DiagramGen.cpp Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/Udm/DiagramGen.cpp Mon Jan 24 15:24:02 2011 (r3613)
@@ -141,12 +141,25 @@
);
if (gen.opts.meta_init == UdmOpts::STATIC_INIT)
+ {
meth_defs.push_back( boost::format("\t::Uml::InitDiagram(meta, \"%1%\", \"%2%\");\n\
\n\
")
% dgr_name
% (string) c.version()
);
+
+ // create a static DN for Uml meta
+ if (dgr_name == "Uml")
+ meth_defs.push_back( boost::format("\tUdmStatic::StaticDataNetwork* dn = new UdmStatic::StaticDataNetwork(diagram);\n\
+\t\tdn->rootobject = meta;\n\
+\t\tdn->systemname = \"%1%\";\n\
+\t\tdn->sem = Udm::CHANGES_LOST_DEFAULT;\n\
+\n\
+")
+ % dgr_name
+ );
+ }
else if (gen.opts.meta_init == UdmOpts::CORBA_INIT)
meth_defs.push_back( boost::format("\t::Uml::InitCORBADiagram(meta, \"%1%\", \"%2%\");\n\
\n\
Modified: UDM/trunk/src/UdmBase/UdmProject.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject.cpp Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/UdmBase/UdmProject.cpp Mon Jan 24 15:24:02 2011 (r3613)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file UdmProject.cpp
// generated from diagram UdmProject
-// generated on Sun Jan 23 02:22:25 2011
+// generated on Mon Jan 24 23:17:28 2011
#include "UdmProject.h"
#include <UmlExt.h>
Modified: UDM/trunk/src/UdmBase/UdmProject_xsd.h
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject_xsd.h Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/UdmBase/UdmProject_xsd.h Mon Jan 24 15:24:02 2011 (r3613)
@@ -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 Sun Jan 23 02:22:25 2011 -->\n";
+// str +="<!-- generated on Mon Jan 24 23:17:28 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 Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/Uml/Uml.cpp Mon Jan 24 15:24:02 2011 (r3613)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file Uml.cpp
// generated from diagram Uml
-// generated on Sun Jan 23 02:22:28 2011
+// generated on Mon Jan 24 23:17:31 2011
#include "Uml.h"
#include <UmlExt.h>
@@ -508,6 +508,12 @@
::Uml::InitDiagram(meta, "Uml", "2.04");
+ UdmStatic::StaticDataNetwork* dn = new UdmStatic::StaticDataNetwork(diagram);
+ dn->rootobject = meta;
+ dn->systemname = "Uml";
+ dn->sem = Udm::CHANGES_LOST_DEFAULT;
+
+
_SetXsdStorage();
}
Modified: UDM/trunk/src/Uml/Uml.h
==============================================================================
--- UDM/trunk/src/Uml/Uml.h Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/Uml/Uml.h Mon Jan 24 15:24:02 2011 (r3613)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Sun Jan 23 02:22:28 2011
+// generated with Udm version 3.27 on Mon Jan 24 23:17:31 2011
#include <UdmBase.h>
Modified: UDM/trunk/src/Uml/Uml.xsd
==============================================================================
--- UDM/trunk/src/Uml/Uml.xsd Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/Uml/Uml.xsd Mon Jan 24 15:24:02 2011 (r3613)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Sun Jan 23 02:22:27 2011 -->
+<!-- generated on Mon Jan 24 23:17:29 2011 -->
<xsd:complexType name="CompositionChildRoleType">
Modified: UDM/trunk/src/Uml/Uml_xsd.h
==============================================================================
--- UDM/trunk/src/Uml/Uml_xsd.h Sat Jan 22 18:28:22 2011 (r3612)
+++ UDM/trunk/src/Uml/Uml_xsd.h Mon Jan 24 15:24:02 2011 (r3613)
@@ -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 Sun Jan 23 02:22:27 2011 -->\n";
+// str +="<!-- generated on Mon Jan 24 23:17:29 2011 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"CompositionChildRoleType\">\n";
More information about the Mobies-commit
mailing list