[GME-commit] GMESRC/Paradigms/MetaGME/Paradigm MetaGME-model.xme,1.9,1.10 MetaGME.xmp,1.33,1.34 New MetaGME-model.xme,1.1,1.2

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

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/Paradigm
In directory braindrain:/tmp/cvs-serv12401

Modified Files:
	MetaGME-model.xme MetaGME.xmp New MetaGME-model.xme 
Log Message:
New meta constraints are merged 

CVS User: volgy

Index: MetaGME-model.xme
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/Paradigm/MetaGME-model.xme,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MetaGME-model.xme	20 Jul 2004 10:48:35 -0000	1.9
--- MetaGME-model.xme	27 Sep 2004 15:37:12 -0000	1.10
***************
*** 2,8 ****
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{0548E6BD-4AFC-41ED-AE0E-17E0229DC608}" cdate="Tue Jul 20 12:44:29 2004" mdate="Tue Jul 20 12:45:16 2004" version="1.0" metaguid="{F39D778D-DEAD-BEEF-FEED-DAD000000001}" 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">
--- 2,8 ----
  <!DOCTYPE project SYSTEM "mga.dtd">
  
[...11463 lines suppressed...]
  				<regnode name="MetaRef" isopaque="yes">
--- 28743,28747 ----
  				</attribute>
  			</set>
! 			<set id="id-0069-00000018" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000143">
  				<name>Constraints</name>
  				<regnode name="MetaRef" isopaque="yes">
***************
*** 28565,28569 ****
  				</attribute>
  			</set>
! 			<set id="id-0069-00000019" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000147 id-0066-00000144">
  				<name>Visualization</name>
  				<regnode name="MetaRef" isopaque="yes">
--- 28764,28768 ----
  				</attribute>
  			</set>
! 			<set id="id-0069-00000019" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000143 id-0066-00000146">
  				<name>Visualization</name>
  				<regnode name="MetaRef" isopaque="yes">

Index: MetaGME.xmp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/Paradigm/MetaGME.xmp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** MetaGME.xmp	20 Jul 2004 10:48:36 -0000	1.33
--- MetaGME.xmp	27 Sep 2004 15:37:12 -0000	1.34
***************
*** 2,8 ****
  <!DOCTYPE paradigm SYSTEM "edf.dtd">
  
! <paradigm name="MetaGME" guid="{DF851054-A0B3-41EF-8FF2-8C42EE5EDD12}" cdate="Mon Jul 19 19:20:23 2004" mdate="Tue Jul 20 12:43:18 2004" >
  
! 	<comment>GME Meta Paradigm </comment>
  
  	<author>A. Ledeczi, P. Volgyesi, J. Sprinkle, T. Paka, Z. Molnar</author>
--- 2,8 ----
  <!DOCTYPE paradigm SYSTEM "edf.dtd">
  
[...2329 lines suppressed...]
***************
*** 2718,2721 ****
--- 2891,2899 ----
  				<dispname>Invalid inheritance. The types of classes ( i.e. descendant and ascendant ) do not comform.</dispname>
  			</constraint>
+ 			<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
+ 				<![CDATA[let name = self.name.trim() in
+ name <> "" implies name.match( "^[_a-zA-Z][_a-zA-Z0-9]*$" )]]>
+ 				<dispname>Format of Name is invalid</dispname>
+ 			</constraint>
  			<attrdef name="DisplayedName" metaref = "1152" valuetype = "string" defvalue = "">
  				<dispname>Displayed name:</dispname>
***************
*** 2786,2790 ****
  			<role name = "SourceToConnector" metaref = "1206" kind = "SourceToConnector"></role>
  			<aspect name = "ClassDiagram" metaref = "1207" >
- 				<dispname>Class Diagram</dispname>
  				<part metaref = "1208" role = "AssociationClass" primary = "yes" linked = "no"></part>
  				<part metaref = "1209" role = "Atom" primary = "yes" linked = "no"></part>
--- 2964,2967 ----

Index: New MetaGME-model.xme
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/Paradigm/New MetaGME-model.xme,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** New MetaGME-model.xme	8 Sep 2004 14:53:05 -0000	1.1
--- New MetaGME-model.xme	27 Sep 2004 15:37:13 -0000	1.2
***************
*** 2,6 ****
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{D621F874-4F19-443C-8BF3-295CB06B8A06}" cdate="Wed Aug 25 15:04:32 2004" mdate="Fri Aug 27 10:32:53 2004" version="" metaguid="{CA0F3DED-BC01-4945-81F3-7A70DECDA055}" metaversion="" metaname="MetaGME">
  	<name>MetaGME</name>
  	<comment></comment>
--- 2,6 ----
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{D621F874-4F19-443C-8BF3-295CB06B8A06}" cdate="Mon Sep 27 09:23:22 2004" mdate="Mon Sep 27 09:23:24 2004" version="" metaguid="{DF851054-A0B3-41EF-8FF2-8C42EE5EDD12}" metaversion="" metaname="MetaGME">
  	<name>MetaGME</name>
[...6201 lines suppressed...]
  				<regnode name="MetaRef" isopaque="yes">
--- 28872,28876 ----
  				</attribute>
  			</set>
! 			<set id="id-0069-00000018" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000143">
  				<name>Constraints</name>
  				<regnode name="MetaRef" isopaque="yes">
***************
*** 28985,28989 ****
  				</attribute>
  			</set>
! 			<set id="id-0069-00000019" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000146 id-0066-00000149">
  				<name>Visualization</name>
  				<regnode name="MetaRef" isopaque="yes">
--- 28893,28897 ----
  				</attribute>
  			</set>
! 			<set id="id-0069-00000019" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000146 id-0066-00000143">
  				<name>Visualization</name>
  				<regnode name="MetaRef" isopaque="yes">