Author: chatellier Date: 2009-05-04 10:13:13 +0000 (Mon, 04 May 2009) New Revision: 491 Modified: eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java Log: Fix primitive type resolution Modified: eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-04-30 17:24:11 UTC (rev 490) +++ eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-05-04 10:13:13 UTC (rev 491) @@ -687,8 +687,16 @@ </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:value-of + <!-- most present test --> + <xsl:if test="document($external-url)/xmi:XMI/descendant::packagedElement[@xmi:type=$xmi-type][@xmi:id=$external-id]"> + <xsl:value-of + select="document($external-url)/xmi:XMI/descendant::packagedElement[@xmi:type=$xmi-type][@xmi:id=$external-id]/@name" /> + </xsl:if> + <!-- specific ecore + <xsl:if test="document($external-url)/xmi:XMI/child::*[@base_PrimitiveType=$external-id]"> + <xsl:value-of select="document($external-url)/xmi:XMI/child::*[@base_PrimitiveType=$external-id]/@instanceClassName" /> + </xsl:if>--> </xsl:otherwise> </xsl:choose> </xsl:when> Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-04-30 17:24:11 UTC (rev 490) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-05-04 10:13:13 UTC (rev 491) @@ -177,7 +177,7 @@ Assert.assertEquals("entities.VpodMapping", opFindByVpodId.get(0).getReturnType()); List<ObjectModelParameter> opFindByVpodIdParams = new ArrayList<ObjectModelParameter>(); opFindByVpodIdParams.addAll(opFindByVpodId.get(0).getParameters()); - Assert.assertEquals("java.lang.String", opFindByVpodIdParams.get(0).getType()); + Assert.assertEquals("String", opFindByVpodIdParams.get(0).getType()); } /**