Author: fdesbois Date: 2009-04-30 13:07:36 +0000 (Thu, 30 Apr 2009) New Revision: 485 Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java Log: reglage bug sur getSupplier a cause de digester : supplier devient supplierName dans l'objectModel (donc methodes setSupplierName et getSupplierName dans ObjectModelDependencyImpl) Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java =================================================================== --- eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java 2009-04-29 15:06:40 UTC (rev 484) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java 2009-04-30 13:07:36 UTC (rev 485) @@ -50,10 +50,14 @@ * Method call for Digester setting properties of Dependency * @param supplierName */ - public void setSupplier(String supplierName) { + public void setSupplierName(String supplierName) { this.supplierName = supplierName; } + public String getSupplierName() { + return this.supplierName; + } + /** * The object instance of supplier is getting from model when supplier is null * @return an ObjectModelClassifier corresponding to the supplier of the dependency Modified: eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-04-29 15:06:40 UTC (rev 484) +++ eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-04-30 13:07:36 UTC (rev 485) @@ -768,7 +768,7 @@ <xsl:attribute name="name"> <xsl:value-of select="@name"/> </xsl:attribute> - <xsl:attribute name="supplier"> + <xsl:attribute name="supplierName"> <xsl:call-template name="fullClassName"> <xsl:with-param name="childpath">UML:Dependency.supplier</xsl:with-param> </xsl:call-template> Modified: eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-04-29 15:06:40 UTC (rev 484) +++ eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-04-30 13:07:36 UTC (rev 485) @@ -398,7 +398,7 @@ <xsl:value-of select="@name" /> </xsl:attribute> - <xsl:attribute name="supplier"> + <xsl:attribute name="supplierName"> <xsl:call-template name="supplierName"> <xsl:with-param name="parent" select="current()" /> </xsl:call-template> Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-04-29 15:06:40 UTC (rev 484) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-04-30 13:07:36 UTC (rev 485) @@ -39,6 +39,7 @@ import org.junit.Before; import org.junit.Test; import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; /** * Test de la feuille de style "xmi1.2ToObjectModel.xsl" @@ -175,6 +176,9 @@ int nbDependencies = 0; for (ObjectModelClassifier classifier : model.getClassifiers()) { nbDependencies += classifier.getDependencies().size(); + for (ObjectModelDependency dependency : classifier.getDependencies()) { + Assert.assertNotNull(dependency.getSupplier()); + } } Assert.assertEquals(4,nbDependencies);