[GME-commit] GMESRC/Paradigms/UML UML.xmp,1.8,1.9 UMLMeta.xme,1.8,1.9

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/Paradigms/UML
In directory escher:/tmp/cvs-serv26232

Modified Files:
	UML.xmp UMLMeta.xme 
Log Message:
Updated to the latest version, sent by the UDM guys.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: UML.xmp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/UML/UML.xmp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** UML.xmp	10 Nov 2004 15:07:05 -0000	1.8
--- UML.xmp	23 Aug 2005 14:32:45 -0000	1.9
***************
*** 2,6 ****
  <!DOCTYPE paradigm SYSTEM "edf.dtd">
  
! <paradigm name="UML" guid="{1537BAF4-11FA-48B0-BFC8-90BC67779455}" cdate="Wed Nov 10 09:05:25 2004" mdate="Wed Nov 10 09:05:25 2004" >
  
  	<comment>Descent into the maelstrom!</comment>
--- 2,6 ----
  <!DOCTYPE paradigm SYSTEM "edf.dtd">
  
! <paradigm name="UML" guid="{7CB32386-EF24-4A75-A787-304C6C1CBF53}" cdate="Tue Aug 23 09:48:32 2005" mdate="Tue Aug 23 09:48:32 2005" >
  
  	<comment>Descent into the maelstrom!</comment>
***************
*** 578,581 ****
--- 578,582 ----
  			<role name = "Class" metaref = "1038" kind = "Class"></role>
  			<role name = "ClassCopy" metaref = "1039" kind = "ClassCopy"></role>
+ 			<role name = "ClassDiagram" metaref = "1085" kind = "ClassDiagram"></role>
  			<role name = "Composition" metaref = "1040" kind = "Composition"></role>
  			<role name = "Connector" metaref = "1041" kind = "Connector"></role>
***************
*** 594,597 ****
--- 595,599 ----
  				<part metaref = "1054" role = "Class" primary = "yes" linked = "no"></part>
  				<part metaref = "1055" role = "ClassCopy" primary = "yes" linked = "no"></part>
+ 				<part metaref = "1086" role = "ClassDiagram" primary = "yes" linked = "no"></part>
  				<part metaref = "1056" role = "Composition" primary = "yes" linked = "no"></part>
  				<part metaref = "1057" role = "Connector" primary = "yes" linked = "no"></part>
***************
*** 613,616 ****
--- 615,633 ----
  			</aspect>
  		</model>
+ 		<model name = "Namespace" metaref = "1087" >
+ 				<regnode name = "namePosition" value ="4"></regnode>
+ 			<constraint name="UniqueNamespaceName" eventmask = "0x0" depth = "0" priority = "2">
+ 				<![CDATA[project.allInstancesOf( Namespace ) -> select( pkg | pkg.name = self.name ) -> size = 1]]>
+ 				<dispname>A namespace must be unique.</dispname>
+ 			</constraint>
+ 			<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
+ 				<![CDATA[name.trim().match( "^[_a-zA-Z][_a-zA-Z0-9]*$" )]]>
+ 				<dispname>Format of the name of the Namespace is invalid</dispname>
+ 			</constraint>
+ 			<role name = "ClassDiagram" metaref = "1078" kind = "ClassDiagram"></role>
+ 			<aspect name = "UML" metaref = "1082" >
+ 				<part metaref = "1083" role = "ClassDiagram" primary = "yes" linked = "no"></part>
+ 			</aspect>
+ 		</model>
  		<model name = "Package" metaref = "1072" attributes = "version" >
  				<regnode name = "namePosition" value ="4"></regnode>
***************
*** 620,625 ****
--- 637,644 ----
  			</constraint>
  			<role name = "ClassDiagram" metaref = "1073" kind = "ClassDiagram"></role>
+ 			<role name = "Namespace" metaref = "1088" kind = "Namespace"></role>
  			<aspect name = "UML" metaref = "1074" attributes = "version" >
  				<part metaref = "1075" role = "ClassDiagram" primary = "yes" linked = "no"></part>
+ 				<part metaref = "1089" role = "Namespace" primary = "yes" linked = "no"></part>
  			</aspect>
  		</model>

Index: UMLMeta.xme
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/UML/UMLMeta.xme,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** UMLMeta.xme	10 Nov 2004 15:07:05 -0000	1.8
--- UMLMeta.xme	23 Aug 2005 14:32:45 -0000	1.9
***************
*** 2,6 ****
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{3E75E147-3375-43A3-89D4-EC1EC55F775A}" cdate="Wed Nov 10 09:05:25 2004" mdate="Wed Nov 10 09:05:25 2004" version="" metaguid="{FEFF5A03-BF64-4567-A10E-EBFCBDD5C475}" metaversion="" metaname="MetaGME">
  	<name>UML</name>
  	<comment>Descent into the maelstrom!</comment>
--- 2,6 ----
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{58EF585A-29ED-442A-892C-AF962FF422F7}" cdate="Tue Aug 23 09:48:32 2005" mdate="Tue Aug 23 09:48:32 2005" version="" metaguid="{B155EEE7-1CDC-4E1F-B6C2-A7B680779457}" metaversion="" metaname="MetaGME">
  	<name>UML</name>
[...2514 lines suppressed...]
! 				<connpoint role="dst" target="id-0067-00000007"/>
  			</connection>
! 			<connection id="id-0068-00000076" kind="AssociationClass" role="AssociationClass" relid="0x1d">
  				<name>AssociationClass</name>
! 				<connpoint role="src" target="id-0066-0000004e"/>
! 				<connpoint role="dst" target="id-0066-00000059"/>
  			</connection>
  		</model>
--- 9020,9030 ----
  					<value></value>
  				</attribute>
! 				<connpoint role="src" target="id-0066-00000049"/>
! 				<connpoint role="dst" target="id-0067-00000008"/>
  			</connection>
! 			<connection id="id-0068-0000007c" kind="AssociationClass" role="AssociationClass" relid="0x1d">
  				<name>AssociationClass</name>
! 				<connpoint role="src" target="id-0066-00000051"/>
! 				<connpoint role="dst" target="id-0066-0000005c"/>
  			</connection>
  		</model>