[GME-commit]
GMESRC/Paradigms/MetaGME/Paradigm MetaGME-model.xme,1.11,1.12
MetaGME.xmp,1.35,1.36
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Fri Feb 10 22:56:44 CST 2006
Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/Paradigm
In directory escher:/tmp/cvs-serv22477
Modified Files:
MetaGME-model.xme MetaGME.xmp
Log Message:
Bond connection type added to ConnLineStart, ConnLineEnd enumattributes of Connection (Connections sheet)
Content-Type fieldAttribute (string) added to FieldAttribute atom (Attributes sheet).
Connector autorouter preference (set in GeneralPref) modified from SEn to SEnw.
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.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MetaGME-model.xme 2 Feb 2005 16:10:58 -0000 1.11
--- MetaGME-model.xme 10 Feb 2006 22:56:41 -0000 1.12
***************
*** 2,6 ****
<!DOCTYPE project SYSTEM "mga.dtd">
! <project guid="{60CDE244-A90A-406F-B2A7-752F74D1D34F}" cdate="Wed Feb 02 10:03:25 2005" mdate="Wed Feb 02 10:03:25 2005" version="" metaguid="{66BBE690-DEAD-BEEF-FEED-DAD000000001}" metaversion="" metaname="MetaGME">
<name>MetaGME</name>
<comment>GME Meta Paradigm</comment>
--- 2,6 ----
<!DOCTYPE project SYSTEM "mga.dtd">
! <project guid="{ECA94912-3A2F-4E93-B1E6-F4C57CD91336}" cdate="Fri Feb 10 16:44:08 2006" mdate="Fri Feb 10 16:44:08 2006" version="" metaguid="{33C377D1-3CDB-4E5D-A92E-34106D8F9D1B}" metaversion="" metaname="MetaGME">
<name>MetaGME</name>
[...10478 lines suppressed...]
<regnode name="MetaRef" isopaque="yes">
--- 28917,28921 ----
</attribute>
</set>
! <set id="id-0069-00000018" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000141">
<name>Constraints</name>
<regnode name="MetaRef" isopaque="yes">
***************
*** 28881,28885 ****
</attribute>
</set>
! <set id="id-0069-00000019" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000140 id-0066-00000143">
<name>Visualization</name>
<regnode name="MetaRef" isopaque="yes">
--- 28938,28942 ----
</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">
Index: MetaGME.xmp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/Paradigm/MetaGME.xmp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** MetaGME.xmp 2 Feb 2005 16:10:59 -0000 1.35
--- MetaGME.xmp 10 Feb 2006 22:56:41 -0000 1.36
***************
*** 2,6 ****
<!DOCTYPE paradigm SYSTEM "edf.dtd">
! <paradigm name="MetaGME" guid="{B155EEE7-1CDC-4E1F-B6C2-A7B680779457}" cdate="Wed Feb 02 10:03:25 2005" mdate="Wed Feb 02 10:03:25 2005" >
<comment>GME Meta Paradigm</comment>
--- 2,6 ----
<!DOCTYPE paradigm SYSTEM "edf.dtd">
! <paradigm name="MetaGME" guid="{33C377D1-3CDB-4E5D-A92E-34106D8F9D1B}" cdate="Fri Feb 10 16:40:25 2006" mdate="Fri Feb 10 16:40:25 2006" >
<comment>GME Meta Paradigm</comment>
***************
*** 458,461 ****
--- 458,462 ----
<enumitem dispname = "Empty Apex" value = "empty apex"></enumitem>
<enumitem dispname = "Empty Bullet" value = "empty bullet"></enumitem>
+ <enumitem dispname = "Bond" value = "bond"></enumitem>
</attrdef>
<attrdef name="ConnLineStart" metaref = "1015" valuetype = "enum" defvalue = "butt">
***************
*** 469,472 ****
--- 470,474 ----
<enumitem dispname = "Empty Apex" value = "empty apex"></enumitem>
<enumitem dispname = "Empty Bullet" value = "empty bullet"></enumitem>
+ <enumitem dispname = "Bond" value = "bond"></enumitem>
</attrdef>
<attrdef name="ConnLineType" metaref = "1016" valuetype = "enum" defvalue = "solid">
***************
*** 501,504 ****
--- 503,509 ----
<enumitem dispname = "10" value = "10"></enumitem>
</attrdef>
+ <attrdef name="ContentType" metaref = "1357" valuetype = "string" defvalue = "">
+ <dispname>Content-Type:</dispname>
+ </attrdef>
<attrdef name="CreateEvent" metaref = "1022" valuetype = "boolean" defvalue = "false">
<dispname>On create</dispname>
***************
*** 693,697 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
--- 698,702 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
***************
*** 824,828 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidColor" eventmask = "0x1" depth = "0" priority = "1">
--- 829,833 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidColor" eventmask = "0x1" depth = "0" priority = "1">
***************
*** 873,877 ****
<atom name = "Connector" metaref = "1073" >
<regnode name = "namePosition" value ="4"></regnode>
! <regnode name = "autorouterPref" value ="SEn"></regnode>
<regnode name = "color" value ="0x0"></regnode>
<constraint name="HasOneAssocClass" eventmask = "0x0" depth = "0" priority = "2">
--- 878,882 ----
<atom name = "Connector" metaref = "1073" >
<regnode name = "namePosition" value ="4"></regnode>
! <regnode name = "autorouterPref" value ="SEnw"></regnode>
<regnode name = "color" value ="0x0"></regnode>
<constraint name="HasOneAssocClass" eventmask = "0x0" depth = "0" priority = "2">
***************
*** 908,912 ****
let dstRole = ( if ( dsts -> size <> 1 ) then "" else dsts.theOnly().oclAsType( ConnectorToDestination ).dstRolename.trim().toLower() endif ) in
srcRole = "" and dstRole = "" or srcRole = "src" and dstRole = "dst"]]>
! <dispname>Role of Source and role of Destination can be only in order: either "src" and "dst" or "" and "".</dispname>
</constraint>
<regnode name = "icon" value ="connector.bmp"></regnode>
--- 913,917 ----
let dstRole = ( if ( dsts -> size <> 1 ) then "" else dsts.theOnly().oclAsType( ConnectorToDestination ).dstRolename.trim().toLower() endif ) in
srcRole = "" and dstRole = "" or srcRole = "src" and dstRole = "dst"]]>
! <dispname>Role of Source and role of Destination can be only in order: either "src" and "dst" or "" and "".</dispname>
</constraint>
<regnode name = "icon" value ="connector.bmp"></regnode>
***************
*** 956,960 ****
endif
]]>
! <dispname>Non of the constraint's owners' implementation inheritance ascendents can have a constraint with the same name as this one.</dispname>
</constraint>
<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
--- 961,965 ----
endif
]]>
! <dispname>Non of the constraint's owners' implementation inheritance ascendents can have a constraint with the same name as this one.</dispname>
</constraint>
<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
***************
*** 1175,1179 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
--- 1180,1184 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
***************
*** 1207,1211 ****
<regnode name = "decorator" value ="Mga.Decorator.MetaDecorator"></regnode>
</atom>
! <atom name = "FieldAttribute" metaref = "1082" attributes = "GlobalScope Help IsViewable Prompt DataType FieldDefault Multiline">
<regnode name = "namePosition" value ="8"></regnode>
<constraint name="DefaultTypeMatch" eventmask = "0x0" depth = "0" priority = "2">
--- 1212,1216 ----
<regnode name = "decorator" value ="Mga.Decorator.MetaDecorator"></regnode>
</atom>
! <atom name = "FieldAttribute" metaref = "1082" attributes = "GlobalScope Help IsViewable Prompt DataType FieldDefault Multiline ContentType">
<regnode name = "namePosition" value ="8"></regnode>
<constraint name="DefaultTypeMatch" eventmask = "0x0" depth = "0" priority = "2">
***************
*** 1287,1291 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Folders' name must be unique.</dispname>
</constraint>
<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
--- 1292,1296 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Folders' name must be unique.</dispname>
</constraint>
<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
***************
*** 1420,1424 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
--- 1425,1429 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
***************
*** 1508,1512 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
--- 1513,1517 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
***************
*** 1697,1701 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
--- 1702,1706 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidInheritance" eventmask = "0x0" depth = "0" priority = "2">
***************
*** 1747,1751 ****
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
--- 1752,1756 ----
<constraint name="UniqueName" eventmask = "0x0" depth = "0" priority = "1">
<![CDATA[project.isNameUnique( self.name.trim() )]]>
! <dispname>Object's name must be unique.</dispname>
</constraint>
<constraint name="ValidName" eventmask = "0x10" depth = "0" priority = "1">
More information about the GME-commit
mailing list