[GME-commit] GMESRC/Paradigms/MetaGME/Paradigm MetaGME-model.xme,1.15,1.16 MetaGME.xmp,1.39,1.40

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

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/Paradigm
In directory escher:/tmp/cvs-serv21688

Modified Files:
	MetaGME-model.xme MetaGME.xmp 
Log Message:
UniqueName constraint removed from MetaGME metamodel.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MetaGME-model.xme
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/Paradigm/MetaGME-model.xme,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MetaGME-model.xme	15 Mar 2006 19:50:02 -0000	1.15
--- MetaGME-model.xme	9 Oct 2006 15:48:36 -0000	1.16
***************
*** 2,10 ****
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{2065A958-6D15-484C-8765-73D67982FF91}" cdate="Wed Mar 15 11:16:15 2006" mdate="Wed Mar 15 11:16:15 2006" version="" metaguid="{B3568889-311A-4E5A-A3DD-A8AC2BD7DE71}" metaversion="" metaname="MetaGME">
  	<name>MetaGME</name>
  	<comment>GME Meta Paradigm</comment>
  	<author>A. Ledeczi, P. Volgyesi, J. Sprinkle, T. Paka, Z. Molnar</author>
! 	<folder id="id-006a-00000001" relid="0x1" childrelidcntr="0xf" kind="RootFolder">
  		<name>MetaGME</name>
  		<regnode name="AspectRegistry" isopaque="yes">
--- 2,10 ----
[...11053 lines suppressed...]
  				<regnode name="MetaRef" isopaque="yes">
--- 29689,29693 ----
  				</attribute>
  			</set>
! 			<set id="id-0069-00000018" kind="Aspect" role="Aspect" guid="{E6C3C1B8-DE58-498e-B1BB-A56CC4501C57}" relid="0x0" members="id-0066-00000141">
  				<name>Constraints</name>
  				<regnode name="MetaRef" isopaque="yes">
***************
*** 28940,28944 ****
  				</attribute>
  			</set>
! 			<set id="id-0069-00000019" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000141 id-0066-00000144">
  				<name>Visualization</name>
  				<regnode name="MetaRef" isopaque="yes">
--- 29710,29714 ----
  				</attribute>
  			</set>
! 			<set id="id-0069-00000019" kind="Aspect" role="Aspect" guid="{A249157D-1270-43cc-88E9-15589D359028}" relid="0x0" members="id-0066-00000141 id-0066-00000144">
  				<name>Visualization</name>
  				<regnode name="MetaRef" isopaque="yes">

Index: MetaGME.xmp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/Paradigm/MetaGME.xmp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** MetaGME.xmp	15 Mar 2006 19:50:02 -0000	1.39
--- MetaGME.xmp	9 Oct 2006 15:48:36 -0000	1.40
***************
*** 2,6 ****
  <!DOCTYPE paradigm SYSTEM "edf.dtd">
  
! <paradigm name="MetaGME" guid="{B3568889-311A-4E5A-A3DD-A8AC2BD7DE71}" cdate="Wed Mar 15 11:16:15 2006" mdate="Wed Mar 15 11:16:15 2006" >
  
  	<comment>GME Meta Paradigm</comment>
--- 2,6 ----
  <!DOCTYPE paradigm SYSTEM "edf.dtd">
  
! <paradigm name="MetaGME" guid="{D300EA57-7F64-4B0E-AE50-878BE38527DC}" cdate="Mon May 22 10:16:40 2006" mdate="Mon May 22 10:16:40 2006" >
  
  	<comment>GME Meta Paradigm</comment>
***************
*** 698,705 ****
  				<dispname>Name cannot be empty.</dispname>
  			</constraint>
- 			<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
- 				<![CDATA[project.isNameUnique( self.name.trim() )]]>
- 				<dispname>Object&apos;s name must be unique.</dispname>
- 			</constraint>
  			<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
  				<![CDATA[let ascs = self.ascendantTypeEnds( -1 ) + self.ascendantTypeEnds( 0 ) + self.ascendantTypeEnds( 1 ) in
--- 698,701 ----
***************
*** 829,836 ****
  				<dispname>Name cannot be empty.</dispname>
  			</constraint>
- 			<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
- 				<![CDATA[project.isNameUnique( self.name.trim() )]]>
- 				<dispname>Object&apos;s name must be unique.</dispname>
- 			</constraint>
  			<constraint name="ValidColor" eventmask = "0x1" depth = "0" priority = "1">
  				<![CDATA[let num = "[0-9a-fA-F]" in
--- 825,828 ----
***************
*** 1180,1187 ****
  				<dispname>Name cannot be empty.</dispname>
  			</constraint>
- 			<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
- 				<![CDATA[project.isNameUnique( self.name.trim() )]]>
- 				<dispname>Object&apos;s name must be unique.</dispname>
- 			</constraint>
  			<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
  				<![CDATA[let ascs = self.ascendantTypeEnds( -1 ) + self.ascendantTypeEnds( 0 ) + self.ascendantTypeEnds( 1 ) in
--- 1172,1175 ----
***************
*** 1292,1299 ****
  				<dispname>Name cannot be empty.</dispname>
  			</constraint>
- 			<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
- 				<![CDATA[project.isNameUnique( self.name.trim() )]]>
- 				<dispname>Folders&apos; name must be unique.</dispname>
- 			</constraint>
  			<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
  				<![CDATA[let name = self.name.trim() in
--- 1280,1283 ----
***************
*** 1425,1432 ****
  				<dispname>Name cannot be empty.</dispname>
  			</constraint>
- 			<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
- 				<![CDATA[project.isNameUnique( self.name.trim() )]]>
- 				<dispname>Object&apos;s name must be unique.</dispname>
- 			</constraint>
  			<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
  				<![CDATA[let ascs = self.ascendantTypeEnds( -1 ) + self.ascendantTypeEnds( 0 ) + self.ascendantTypeEnds( 1 ) in
--- 1409,1412 ----
***************
*** 1513,1520 ****
  				<dispname>Name cannot be empty.</dispname>
  			</constraint>
- 			<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
- 				<![CDATA[project.isNameUnique( self.name.trim() )]]>
- 				<dispname>Object&apos;s name must be unique.</dispname>
- 			</constraint>
  			<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
  				<![CDATA[let ascs = self.ascendantTypeEnds( -1 ) + self.ascendantTypeEnds( 0 ) + self.ascendantTypeEnds( 1 ) in
--- 1493,1496 ----
***************
*** 1701,1708 ****
  self.name.trim() <> ""]]>
  				<dispname>Name cannot be empty.</dispname>
- 			</constraint>
- 			<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
- 				<![CDATA[project.isNameUnique( self.name.trim() )]]>
- 				<dispname>Object&apos;s name must be unique.</dispname>
  			</constraint>
  			<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
--- 1677,1680 ----