Author: fdesbois Date: 2009-10-19 15:50:43 +0200 (Mon, 19 Oct 2009) New Revision: 643 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java trunk/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java trunk/eugene/src/test/resources/xmi/1.2/topiatest.xmi trunk/eugene/src/test/resources/xmi/1.2/topiatest.zargo Log: Evol #97 : Add model version Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java 2009-10-19 09:55:11 UTC (rev 642) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java 2009-10-19 13:50:43 UTC (rev 643) @@ -37,6 +37,13 @@ public abstract String getName(); /** + * Returns the version of this model. + * + * @return the version of this model. + */ + public abstract String getVersion(); + + /** * Returns the tagValues associated with this element. * For each entry, the key is the name of the tagValue, the value is the value of the tagValue :-) * Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-10-19 09:55:11 UTC (rev 642) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-10-19 13:50:43 UTC (rev 643) @@ -52,6 +52,7 @@ public class ObjectModelImpl implements ObjectModel { protected String name = null; + protected String version = null; protected Map<String, ObjectModelClass> classes = new HashMap<String, ObjectModelClass>(); protected Map<String, ObjectModelInterface> interfaces = new HashMap<String, ObjectModelInterface>(); protected Map<String, ObjectModelClassifier> classifiers = new HashMap<String, ObjectModelClassifier>(); @@ -65,6 +66,15 @@ this.name = name; } + public void setVersion(String version) { + this.version = version; + } + + @Override + public String getVersion() { + return this.version; + } + public void addClass(ObjectModelClassImpl clazz) { //if (clazz == null) // return new ObjectModelClassImpl(this, null); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2009-10-19 09:55:11 UTC (rev 642) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2009-10-19 13:50:43 UTC (rev 643) @@ -48,6 +48,11 @@ protected String name = null; /** + * Version of this model + */ + protected String version = null; + + /** * Model tagged values */ protected Map<String, String> modelTagValues; @@ -134,4 +139,23 @@ return (key == null ? null : (String) modelTagValues.get(key)); } + /** + * Set model version. + * + * @param name model version + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * Get model version. + * + * @return model version + */ + @Override + public String getVersion() { + return this.version; + } + } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-10-19 09:55:11 UTC (rev 642) +++ trunk/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-10-19 13:50:43 UTC (rev 643) @@ -147,9 +147,11 @@ File objectModelFile = transformXMI(xmiFile, "topiatest.objectmodel"); - ObjectModel model = loadModel(objectModelFile); + ObjectModel model = loadModel(objectModelFile); Assert.assertNotNull(model); + // Test for model version + Assert.assertEquals("1.2",model.getVersion()); Assert.assertEquals("TopiaTest", model.getName()); Assert.assertEquals(22, model.getClassifiers().size()); Modified: trunk/eugene/src/test/resources/xmi/1.2/topiatest.xmi =================================================================== --- trunk/eugene/src/test/resources/xmi/1.2/topiatest.xmi 2009-10-19 09:55:11 UTC (rev 642) +++ trunk/eugene/src/test/resources/xmi/1.2/topiatest.xmi 2009-10-19 13:50:43 UTC (rev 643) @@ -1,8 +1,8 @@ <?xml version = '1.0' encoding = 'UTF-8' ?> -<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Sep 21 18:42:26 CEST 2009'> +<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:46:43 CEST 2009'> <XMI.header> <XMI.documentation> <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> - <XMI.exporterVersion>0.28(6) revised on $Date: 2007-05-12 08:08:08 +0200 (Sat, 12 May 2007) $ </XMI.exporterVersion> + <XMI.exporterVersion>0.28.1(6) revised on $Date: 2007-05-12 08:08:08 +0200 (Sat, 12 May 2007) $ </XMI.exporterVersion> </XMI.documentation> <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> <XMI.content> @@ -12,7 +12,7 @@ <UML:ModelElement.taggedValue> <UML:TaggedValue xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E3' isSpecification = 'false'> - <UML:TaggedValue.dataValue>1</UML:TaggedValue.dataValue> + <UML:TaggedValue.dataValue>1.2</UML:TaggedValue.dataValue> <UML:TaggedValue.type> <UML:TagDefinition xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4'/> </UML:TaggedValue.type> Modified: trunk/eugene/src/test/resources/xmi/1.2/topiatest.zargo =================================================================== (Binary files differ)