Author: schorlet Date: 2008-12-08 10:19:24 +0000 (Mon, 08 Dec 2008) New Revision: 384 Added: lutingenerator/trunk/src/main/resources/xmi/ lutingenerator/trunk/src/main/resources/xmi/default-java.xmi lutingenerator/trunk/src/main/resources/xmi/default-uml14.xmi Modified: lutingenerator/trunk/changelog lutingenerator/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl Log: [#1737] Prise en compte du MetaModel UML dans les fichiers XMI Ajout du support pour default-java.xmi and default-uml14.xmi Modified: lutingenerator/trunk/changelog =================================================================== --- lutingenerator/trunk/changelog 2008-12-03 12:25:24 UTC (rev 383) +++ lutingenerator/trunk/changelog 2008-12-08 10:19:24 UTC (rev 384) @@ -1,3 +1,7 @@ +0.62-SNAPSHOT + * 20081208 [chorlet] correction bug #1737: Prise en compte du MetaModel UML dans les fichiers XMI + - ajout du support des fichiers default-java.xml et default-uml14.xmi + 0.62 chemit 200811?? * 20081203 [chemit] add a encoding property on generator to control file generation encoding * 20081118 [chemit] use lutinproject 3.1 @@ -71,4 +75,4 @@ 0.26 - * Ajout du support des stereotypes sur les attributs \ No newline at end of file + * Ajout du support des stereotypes sur les attributs Added: lutingenerator/trunk/src/main/resources/xmi/default-java.xmi =================================================================== --- lutingenerator/trunk/src/main/resources/xmi/default-java.xmi (rev 0) +++ lutingenerator/trunk/src/main/resources/xmi/default-java.xmi 2008-12-08 10:19:24 UTC (rev 384) @@ -0,0 +1,117 @@ +<?xml version = '1.0' encoding = 'UTF-8' ?> +<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Fri May 02 13:16:12 EDT 2008'> + <XMI.header> <XMI.documentation> + <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> + <XMI.exporterVersion>PRE-0.25.5(5) revised on $Date: 2007-05-12 02:08:08 -0400 (Sat, 12 May 2007) $ </XMI.exporterVersion> + </XMI.documentation> + <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> + <XMI.content> + <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'/> + </UML:ModelElement.stereotype> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '-64--88-1-3--3c483fe3:119aa9cff00:-8000:00000000000007A4' + 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#.:000000000000087C'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '.:0000000000000869' name = 'java' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '.:000000000000085A' name = 'lang' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '.:0000000000000850' name = 'Object' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000851' name = 'Char' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000852' name = 'Byte' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000853' name = 'Boolean' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000854' name = 'Short' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000855' name = 'Integer' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000856' name = 'Long' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000857' name = 'Float' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000858' name = 'Double' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = '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 = '.:0000000000000863' name = 'util' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '.:000000000000085B' name = 'Vector' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Interface xmi.id = '.:000000000000085C' name = 'Collection' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:Interface xmi.id = '.:000000000000085D' name = 'Iterator' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:Interface xmi.id = '.:000000000000085E' name = 'List' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:Class xmi.id = '.:000000000000085F' name = 'Date' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Class xmi.id = '.:0000000000000860' name = 'Time' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + <UML:Interface xmi.id = '.:0000000000000861' name = 'Set' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = '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 = '.:0000000000000866' name = 'math' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '.:0000000000000864' name = 'BigDecimal' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = '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 = '.:0000000000000868' name = 'net' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Namespace.ownedElement> + <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 = '.:000000000000086B' name = 'void' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:DataType xmi.id = '.:000000000000086C' name = 'int' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:DataType xmi.id = '.:000000000000086D' name = 'short' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:DataType xmi.id = '.:000000000000086E' name = 'long' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:DataType xmi.id = '.:000000000000086F' name = 'double' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:DataType xmi.id = '.:0000000000000870' name = 'float' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:DataType xmi.id = '.:0000000000000871' name = 'char' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/> + <UML:DataType xmi.id = '.:0000000000000872' name = 'byte' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = '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' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Model</UML:Stereotype.baseClass> + </UML:Stereotype> + </UML:Namespace.ownedElement> + </UML:Model> + </XMI.content> +</XMI> Added: lutingenerator/trunk/src/main/resources/xmi/default-uml14.xmi =================================================================== --- lutingenerator/trunk/src/main/resources/xmi/default-uml14.xmi (rev 0) +++ lutingenerator/trunk/src/main/resources/xmi/default-uml14.xmi 2008-12-08 10:19:24 UTC (rev 384) @@ -0,0 +1,258 @@ +<?xml version = '1.0' encoding = 'UTF-8' ?> +<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Tue Aug 14 18:51:04 BRT 2007'> + <XMI.header> <XMI.documentation> + <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> + <XMI.exporterVersion>PRE-0.25.4(5) revised on $Date: 2007-05-12 03:08:08 -0300 $ </XMI.exporterVersion> + </XMI.documentation> + <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> + <XMI.content> + <UML:Model xmi.id = '.:000000000000087A' name = 'UML 1.4 Standard Elements' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '.:000000000000087B' isSpecification = 'false'> + <UML:TaggedValue.dataValue>This model contains the UML Standard Elements from Appendix A of the UML 1.4 specification.</UML:TaggedValue.dataValue> + <UML:TaggedValue.type> + <UML:TagDefinition xmi.idref = '.:000000000000087C'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:Namespace.ownedElement> + <UML:Stereotype xmi.id = '.:0000000000000821' name = 'access' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Permission</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000822' name = 'friend' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Permission</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000823' name = 'import' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Permission</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000824' name = 'association' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>AssociationEnd</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000825' name = 'global' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>AssociationEnd</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000826' name = 'local' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>AssociationEnd</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000827' name = 'parameter' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>AssociationEnd</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000828' name = 'self' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>AssociationEnd</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000829' name = 'become' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Flow</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000082A' name = 'copy' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Flow</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000082B' name = 'create' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Usage</UML:Stereotype.baseClass> + <UML:Stereotype.baseClass>BehavioralFeature</UML:Stereotype.baseClass> + <UML:Stereotype.baseClass>CallEvent</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000082C' name = 'call' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Usage</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000082D' name = 'instantiate' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Usage</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000082E' name = 'send' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Usage</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000830' name = 'destroy' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>BehavioralFeature</UML:Stereotype.baseClass> + <UML:Stereotype.baseClass>CallEvent</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000833' name = 'derive' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000834' name = 'realize' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000835' name = 'refine' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000836' name = 'trace' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000837' name = 'document' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000838' name = 'executable' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000839' name = 'file' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000083A' name = 'library' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000083B' name = 'table' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000083C' name = 'facade' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000083D' name = 'framework' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000083E' name = 'metamodel' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000083F' name = 'stub' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000840' name = 'implementation' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Generalization</UML:Stereotype.baseClass> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000842' name = 'type' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000843' name = 'implicit' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Association</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000844' name = 'invariant' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Constraint</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000845' name = 'postcondition' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Constraint</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000846' name = 'precondition' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Constraint</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000847' name = 'metaclass' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000848' name = 'powertype' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000849' name = 'process' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Classifier</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000084A' name = 'thread' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Classifier</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000084B' name = 'utility' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Classifier</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000084C' name = 'requirement' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Comment</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000084D' name = 'responsibility' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Comment</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000084E' name = 'topLevel' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000084F' name = 'systemModel' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:000000000000086A' name = 'signalflow' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>ObjectFlowState</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000874' name = 'appliedProfile' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + <UML:Stereotype.baseClass>Dependency</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000875' name = 'auxiliary' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000876' name = 'modelLibrary' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + <UML:Stereotype.baseClass>Dependency</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000877' name = 'profile' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Package</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000878' name = 'source' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '.:0000000000000879' name = 'stateInvariant' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Stereotype.baseClass>Constraint</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:TagDefinition xmi.id = '.:000000000000087C' name = 'documentation' + isSpecification = 'false' tagType = 'String'> + <UML:TagDefinition.multiplicity> + <UML:Multiplicity xmi.id = '.:000000000000087D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '.:000000000000087E' lower = '0' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:TagDefinition.multiplicity> + </UML:TagDefinition> + <UML:DataType xmi.id = '-84-17--56-5-43645a83:11466542d86:-8000:000000000000087C' + name = 'Integer' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'/> + <UML:DataType xmi.id = '-84-17--56-5-43645a83:11466542d86:-8000:000000000000087D' + name = 'UnlimitedInteger' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'/> + <UML:DataType xmi.id = '-84-17--56-5-43645a83:11466542d86:-8000:000000000000087E' + name = 'String' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'/> + <UML:Enumeration xmi.id = '-84-17--56-5-43645a83:11466542d86:-8000:0000000000000880' + name = 'Boolean' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Enumeration.literal> + <UML:EnumerationLiteral xmi.id = '-84-17--56-5-43645a83:11466542d86:-8000:0000000000000881' + name = 'TRUE' isSpecification = 'false'/> + <UML:EnumerationLiteral xmi.id = '-84-17--56-5-43645a83:11466542d86:-8000:0000000000000882' + name = 'FALSE' isSpecification = 'false'/> + </UML:Enumeration.literal> + </UML:Enumeration> + </UML:Namespace.ownedElement> + </UML:Model> + </XMI.content> +</XMI> Modified: lutingenerator/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- lutingenerator/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2008-12-03 12:25:24 UTC (rev 383) +++ lutingenerator/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2008-12-08 10:19:24 UTC (rev 384) @@ -572,13 +572,27 @@ </xsl:variable> </xsl:if> --> - <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::*[@xmi.id = $id]"> - <xsl:attribute name="type"> - <xsl:call-template name="packagePathOfWithDot"/> - <xsl:value-of select="@name"/> - </xsl:attribute> - </xsl:for-each> - + <xsl:choose> + <xsl:when test="$id != ''"> + <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::*[@xmi.id = $id]"> + <xsl:attribute name="type"> + <xsl:call-template name="packagePathOfWithDot"/> + <xsl:value-of select="@name"/> + </xsl:attribute> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:variable name="external-url" select="substring-before(UML:StructuralFeature.type/UML:*/@href, '#')"/> + <xsl:variable name="external-id" select="substring-after(UML:StructuralFeature.type/UML:*/@href, '#')"/> + <xsl:for-each select="document($external-url)//descendant::*[@xmi.id=$external-id]"> + <xsl:attribute name="type"> + <xsl:call-template name="packagePathOfWithDot"/> + <xsl:value-of select="@name"/> + </xsl:attribute> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="UML:StructuralFeature.multiplicity"> <xsl:variable name="minMultiplicity"> <xsl:value-of select="UML:StructuralFeature.multiplicity/UML:Multiplicity/UML:Multiplicity.range/UML:MultiplicityRange/@lower"/> @@ -795,8 +809,11 @@ <xsl:variable name="tagName"> <!-- see bug http://lists.labs.libre-entreprise.org/pipermail/lutingenerator-devel/2007-J... les UML:TagDefinition n'apparaisent pas au meme endroit (a voir pk) - <xsl:value-of select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/UML:TagDefinition[@xmi.id = $tagId]/@name"/>--> - <xsl:value-of select="//UML:TagDefinition[@xmi.id = $tagId]/@name"/> + <xsl:value-of select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/UML:TagDefinition[@xmi.id = $tagId]/@name"/> + <xsl:value-of select="//UML:TagDefinition[@xmi.id = $tagId]/@name"/>--> + <xsl:variable name="external-url" select="substring-before(UML:TaggedValue.type/UML:TagDefinition/@href, '#')"/> + <xsl:variable name="external-id" select="substring-after(UML:TaggedValue.type/UML:TagDefinition/@href, '#')"/> + <xsl:value-of select="document($external-url)//descendant::*[@xmi.id=$external-id]/@name"/> </xsl:variable> <xsl:element name="tagValue"> <xsl:attribute name="name">