Author: fdesbois Date: 2009-11-05 18:38:18 +0100 (Thu, 05 Nov 2009) New Revision: 695 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/Model.java branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java Log: Merge from r643 Modified: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/Model.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/Model.java 2009-11-05 15:10:25 UTC (rev 694) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/Model.java 2009-11-05 17:38:18 UTC (rev 695) @@ -39,6 +39,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: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-11-05 15:10:25 UTC (rev 694) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-11-05 17:38:18 UTC (rev 695) @@ -53,6 +53,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>(); @@ -70,6 +71,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: branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java =================================================================== --- branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2009-11-05 15:10:25 UTC (rev 694) +++ branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2009-11-05 17:38:18 UTC (rev 695) @@ -50,6 +50,11 @@ protected String name = null; /** + * Version of this model + */ + protected String version = null; + + /** * Model tagged values */ protected Map<String, String> modelTagValues; @@ -136,4 +141,24 @@ 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: branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java =================================================================== --- branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-11-05 15:10:25 UTC (rev 694) +++ branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-11-05 17:38:18 UTC (rev 695) @@ -149,6 +149,9 @@ File objectModelFile = transformXMI(xmiFile, "topiatest.objectmodel"); ObjectModel model = loadModel(objectModelFile); + + // Test for model version + Assert.assertEquals("1.2",model.getVersion()); Assert.assertNotNull(model); Assert.assertEquals("TopiaTest", model.getName());