Author: tfmorris Date: 2008-05-04 13:26:26-0700 New Revision: 14614 Modified: trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi
Log: Issue 5064 - Fix handling of profiles that refer to other profiles. Revert xmi.id changes to Java profile. Modified: trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi?view=diff&rev=14614&p1=trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi&p2=trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi&r1=14613&r2=14614 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi (original) +++ trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi 2008-05-04 13:26:26-0700 @@ -6,7 +6,7 @@ </XMI.documentation> <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> <XMI.content> - <UML:Model xmi.id = 'javaprofile:000000000000087A' name = 'UML Profile for Java' isSpecification = 'false' + <UML:Model xmi.id = '.:000000000000087A' name = 'UML Profile for Java' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> <UML:ModelElement.stereotype> <UML:Stereotype xmi.idref = '-64--88-1-3--3c483fe3:119aa9cff00:-8000:00000000000007A3'/> @@ -16,95 +16,95 @@ isSpecification = 'false'> <UML:TaggedValue.dataValue>This profile contains common Java classes and datatypes which are not contained in the UML Standard Elements profile. It only includes the basics, but may be easily extended to include anything else which is useful.</UML:TaggedValue.dataValue> <UML:TaggedValue.type> - <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#javaprofile:000000000000087C'/> + <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> </UML:TaggedValue.type> </UML:TaggedValue> </UML:ModelElement.taggedValue> <UML:Namespace.ownedElement> - <UML:Package xmi.id = 'javaprofile:0000000000000869' name = 'java' isSpecification = 'false' + <UML:Package xmi.id = '.:0000000000000869' name = 'java' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> <UML:Namespace.ownedElement> - <UML:Package xmi.id = 'javaprofile:000000000000085A' name = 'lang' isSpecification = 'false' + <UML:Package xmi.id = '.:000000000000085A' name = 'lang' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> <UML:Namespace.ownedElement> - <UML:Class xmi.id = 'javaprofile:0000000000000850' name = 'Object' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000850' name = 'Object' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000851' name = 'Char' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000851' name = 'Char' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000852' name = 'Byte' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000852' name = 'Byte' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000853' name = 'Boolean' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000853' name = 'Boolean' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000854' name = 'Short' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000854' name = 'Short' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000855' name = 'Integer' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000855' name = 'Integer' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000856' name = 'Long' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000856' name = 'Long' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000857' name = 'Float' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000857' name = 'Float' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000858' name = 'Double' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000858' name = 'Double' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000859' name = 'String' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000859' name = 'String' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> </UML:Namespace.ownedElement> </UML:Package> - <UML:Package xmi.id = 'javaprofile:0000000000000863' name = 'util' isSpecification = 'false' + <UML:Package xmi.id = '.:0000000000000863' name = 'util' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> <UML:Namespace.ownedElement> - <UML:Class xmi.id = 'javaprofile:000000000000085B' name = 'Vector' isSpecification = 'false' + <UML:Class xmi.id = '.:000000000000085B' name = 'Vector' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Interface xmi.id = 'javaprofile:000000000000085C' name = 'Collection' isSpecification = 'false' + <UML:Interface xmi.id = '.:000000000000085C' name = 'Collection' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:Interface xmi.id = 'javaprofile:000000000000085D' name = 'Iterator' isSpecification = 'false' + <UML:Interface xmi.id = '.:000000000000085D' name = 'Iterator' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:Interface xmi.id = 'javaprofile:000000000000085E' name = 'List' isSpecification = 'false' + <UML:Interface xmi.id = '.:000000000000085E' name = 'List' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:Class xmi.id = 'javaprofile:000000000000085F' name = 'Date' isSpecification = 'false' + <UML:Class xmi.id = '.:000000000000085F' name = 'Date' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000860' name = 'Time' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000860' name = 'Time' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Interface xmi.id = 'javaprofile:0000000000000861' name = 'Set' isSpecification = 'false' + <UML:Interface xmi.id = '.:0000000000000861' name = 'Set' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:Interface xmi.id = 'javaprofile:0000000000000862' name = 'SortedSet' isSpecification = 'false' + <UML:Interface xmi.id = '.:0000000000000862' name = 'SortedSet' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> </UML:Namespace.ownedElement> </UML:Package> - <UML:Package xmi.id = 'javaprofile:0000000000000866' name = 'math' isSpecification = 'false' + <UML:Package xmi.id = '.:0000000000000866' name = 'math' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> <UML:Namespace.ownedElement> - <UML:Class xmi.id = 'javaprofile:0000000000000864' name = 'BigDecimal' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000864' name = 'BigDecimal' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - <UML:Class xmi.id = 'javaprofile:0000000000000865' name = 'BigInteger' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000865' name = 'BigInteger' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> </UML:Namespace.ownedElement> </UML:Package> - <UML:Package xmi.id = 'javaprofile:0000000000000868' name = 'net' isSpecification = 'false' + <UML:Package xmi.id = '.:0000000000000868' name = 'net' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> <UML:Namespace.ownedElement> - <UML:Class xmi.id = 'javaprofile:0000000000000867' name = 'URL' isSpecification = 'false' + <UML:Class xmi.id = '.:0000000000000867' name = 'URL' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> </UML:Namespace.ownedElement> </UML:Package> </UML:Namespace.ownedElement> </UML:Package> - <UML:DataType xmi.id = 'javaprofile:000000000000086B' name = 'void' isSpecification = 'false' + <UML:DataType xmi.id = '.:000000000000086B' name = 'void' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:000000000000086C' name = 'int' isSpecification = 'false' + <UML:DataType xmi.id = '.:000000000000086C' name = 'int' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:000000000000086D' name = 'short' isSpecification = 'false' + <UML:DataType xmi.id = '.:000000000000086D' name = 'short' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:000000000000086E' name = 'long' isSpecification = 'false' + <UML:DataType xmi.id = '.:000000000000086E' name = 'long' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:000000000000086F' name = 'double' isSpecification = 'false' + <UML:DataType xmi.id = '.:000000000000086F' name = 'double' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:0000000000000870' name = 'float' isSpecification = 'false' + <UML:DataType xmi.id = '.:0000000000000870' name = 'float' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:0000000000000871' name = 'char' isSpecification = 'false' + <UML:DataType xmi.id = '.:0000000000000871' name = 'char' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:0000000000000872' name = 'byte' isSpecification = 'false' + <UML:DataType xmi.id = '.:0000000000000872' name = 'byte' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> - <UML:DataType xmi.id = 'javaprofile:0000000000000873' name = 'boolean' isSpecification = 'false' + <UML:DataType xmi.id = '.:0000000000000873' name = 'boolean' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> <UML:Stereotype xmi.id = '-64--88-1-3--3c483fe3:119aa9cff00:-8000:00000000000007A3' name = 'profile' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
