Bug 565745 - update Ecore jet classes
Updated XMIToXML and XMLToXMI - template changes
Change-Id: I5dbc624e4cf097ff1d3498c0db6a37f590339ace
Signed-off-by: Ralph Soika <ralph.soika@imixs.com>
diff --git a/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMIToXML.java b/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMIToXML.java
index 8525381..9c377d6 100644
--- a/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMIToXML.java
+++ b/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMIToXML.java
@@ -46,44 +46,36 @@
protected final String TEXT_11 = "Template\" ";
protected final String TEXT_12 = " match=\"//bpmn2xmi:Definitions\">" + NL + " <bpmn2:definitions>" + NL + " <xsl:call-template name=\"DefinitionsAttributesTemplate\"/>";
protected final String TEXT_13 = " > ";
- protected final String TEXT_14 = NL + " <xsl:call-template name=\"";
- protected final String TEXT_15 = "Template\"/> ";
- protected final String TEXT_16 = NL + " <xsl:call-template name=\"SplitString\">" + NL + " <xsl:with-param name=\"list\" select=\"";
- protected final String TEXT_17 = "\" />" + NL + " <xsl:with-param name=\"elementName\" select=\"'";
- protected final String TEXT_18 = ":";
- protected final String TEXT_19 = "'\" />" + NL + " <xsl:with-param name=\"elementNamespace\" select=\"'";
- protected final String TEXT_20 = "'\" />" + NL + " </xsl:call-template>";
- protected final String TEXT_21 = NL + " <";
- protected final String TEXT_22 = ":";
- protected final String TEXT_23 = "><xsl:value-of select=\"";
- protected final String TEXT_24 = "\"/></";
- protected final String TEXT_25 = ":";
- protected final String TEXT_26 = ">";
- protected final String TEXT_27 = NL + " <xsl:for-each select=\"";
- protected final String TEXT_28 = "\">\t\t\t";
- protected final String TEXT_29 = NL + " <xsl:choose>";
- protected final String TEXT_30 = NL + " <xsl:when test=\"substring-after(@xmi:type, ':') = '";
- protected final String TEXT_31 = "' or substring-after(@xsi:type, ':') = '";
- protected final String TEXT_32 = "'\">" + NL + " <";
- protected final String TEXT_33 = ":";
- protected final String TEXT_34 = ">" + NL + " <xsl:call-template name=\"";
- protected final String TEXT_35 = "AttributesTemplate\"/> " + NL + " <xsl:call-template name=\"";
- protected final String TEXT_36 = "Template\" />\t \t\t " + NL + "\t </";
- protected final String TEXT_37 = ":";
- protected final String TEXT_38 = ">" + NL + "\t </xsl:when>";
- protected final String TEXT_39 = NL + " </xsl:choose>";
- protected final String TEXT_40 = NL + " <";
- protected final String TEXT_41 = ":";
- protected final String TEXT_42 = ">" + NL + " <xsl:call-template name=\"";
- protected final String TEXT_43 = "AttributesTemplate\"/> " + NL + " <xsl:call-template name=\"";
- protected final String TEXT_44 = "Template\" />\t\t\t " + NL + " </";
- protected final String TEXT_45 = ":";
- protected final String TEXT_46 = ">";
- protected final String TEXT_47 = NL + "\t </xsl:for-each>\t\t\t\t\t\t";
- protected final String TEXT_48 = " </bpmn2:definitions>";
- protected final String TEXT_49 = NL + "\t</xsl:template>" + NL + "\t";
- protected final String TEXT_50 = NL + NL + "</xsl:stylesheet>";
- protected final String TEXT_51 = NL;
+ protected final String TEXT_14 = "Template\"/> ";
+ protected final String TEXT_15 = NL + " <xsl:call-template name=\"SplitString\">" + NL + " <xsl:with-param name=\"list\" select=\"";
+ protected final String TEXT_16 = "\" />" + NL + " <xsl:with-param name=\"elementName\" select=\"'";
+ protected final String TEXT_17 = ":";
+ protected final String TEXT_18 = "'\" />" + NL + " <xsl:with-param name=\"elementNamespace\" select=\"'";
+ protected final String TEXT_19 = "'\" />" + NL + " </xsl:call-template>";
+ protected final String TEXT_20 = NL + " <";
+ protected final String TEXT_21 = "><xsl:value-of select=\"";
+ protected final String TEXT_22 = "\"/></";
+ protected final String TEXT_23 = ">";
+ protected final String TEXT_24 = NL + " <xsl:for-each select=\"";
+ protected final String TEXT_25 = "\">\t\t\t";
+ protected final String TEXT_26 = NL + " <xsl:choose>";
+ protected final String TEXT_27 = NL + " <xsl:when test=\"substring-after(@xmi:type, ':') = '";
+ protected final String TEXT_28 = "' or substring-after(@xsi:type, ':') = '";
+ protected final String TEXT_29 = "'\">" + NL + " <";
+ protected final String TEXT_30 = ">" + NL + " <xsl:call-template name=\"";
+ protected final String TEXT_31 = "AttributesTemplate\"/> " + NL + " <xsl:call-template name=\"";
+ protected final String TEXT_32 = "Template\" />\t \t\t " + NL + "\t </";
+ protected final String TEXT_33 = ">" + NL + "\t </xsl:when>";
+ protected final String TEXT_34 = NL + " </xsl:choose>";
+ protected final String TEXT_35 = NL + " <";
+ protected final String TEXT_36 = ">" + NL + " <xsl:call-template name=\"";
+ protected final String TEXT_37 = "AttributesTemplate\"/> " + NL + " <xsl:call-template name=\"";
+ protected final String TEXT_38 = "Template\" />\t\t\t " + NL + " </";
+ protected final String TEXT_39 = NL + "\t </xsl:for-each>\t\t\t\t\t\t";
+ protected final String TEXT_40 = " </bpmn2:definitions>";
+ protected final String TEXT_41 = NL + "\t</xsl:template>" + NL + "\t";
+ protected final String TEXT_42 = NL + NL + "</xsl:stylesheet>";
+ protected final String TEXT_43 = NL;
public String generate(Object argument)
{
@@ -117,84 +109,84 @@
stringBuffer.append(TEXT_13);
}
for(EClass superClass: c.getESuperTypes()) {
- stringBuffer.append(TEXT_14);
+ stringBuffer.append(TEXT_4);
stringBuffer.append(superClass.getName());
- stringBuffer.append(TEXT_15);
+ stringBuffer.append(TEXT_14);
}
for(EStructuralFeature feature: input.getAllElementsInXml(c)) {
if(input.isReference(feature)) {
+ stringBuffer.append(TEXT_15);
+ stringBuffer.append(input.getXPathForXMI(feature));
stringBuffer.append(TEXT_16);
- stringBuffer.append(input.getXPathForXMI(feature));
+ stringBuffer.append(input.getPrefix(feature));
stringBuffer.append(TEXT_17);
- stringBuffer.append(input.getPrefix(feature));
+ stringBuffer.append(input.getExtendedMetadata().getName(feature));
stringBuffer.append(TEXT_18);
- stringBuffer.append(input.getExtendedMetadata().getName(feature));
- stringBuffer.append(TEXT_19);
stringBuffer.append(input.getNamespace(feature));
- stringBuffer.append(TEXT_20);
+ stringBuffer.append(TEXT_19);
} else if(input.isSimpleElement(feature)) {
- stringBuffer.append(TEXT_21);
+ stringBuffer.append(TEXT_20);
stringBuffer.append(input.getPrefix(feature));
- stringBuffer.append(TEXT_22);
+ stringBuffer.append(TEXT_17);
stringBuffer.append(input.getExtendedMetadata().getName(feature));
- stringBuffer.append(TEXT_23);
+ stringBuffer.append(TEXT_21);
stringBuffer.append(input.getXPathForXMI(feature));
- stringBuffer.append(TEXT_24);
+ stringBuffer.append(TEXT_22);
stringBuffer.append(input.getPrefix(feature));
- stringBuffer.append(TEXT_25);
+ stringBuffer.append(TEXT_17);
stringBuffer.append(feature.getName());
- stringBuffer.append(TEXT_26);
+ stringBuffer.append(TEXT_23);
} else {
- stringBuffer.append(TEXT_27);
+ stringBuffer.append(TEXT_24);
stringBuffer.append(feature.getName());
- stringBuffer.append(TEXT_28);
+ stringBuffer.append(TEXT_25);
if (input.hasSubFeatures(feature)) {
- stringBuffer.append(TEXT_29);
+ stringBuffer.append(TEXT_26);
for(EStructuralFeature subFeature: input.getAllSubFeatures(feature)) {
+ stringBuffer.append(TEXT_27);
+ stringBuffer.append(subFeature.getEType().getName());
+ stringBuffer.append(TEXT_28);
+ stringBuffer.append(subFeature.getEType().getName());
+ stringBuffer.append(TEXT_29);
+ stringBuffer.append(input.getPrefix(subFeature));
+ stringBuffer.append(TEXT_17);
+ stringBuffer.append(input.getExtendedMetadata().getName(subFeature));
stringBuffer.append(TEXT_30);
stringBuffer.append(subFeature.getEType().getName());
stringBuffer.append(TEXT_31);
stringBuffer.append(subFeature.getEType().getName());
stringBuffer.append(TEXT_32);
stringBuffer.append(input.getPrefix(subFeature));
+ stringBuffer.append(TEXT_17);
+ stringBuffer.append(input.getExtendedMetadata().getName(subFeature));
stringBuffer.append(TEXT_33);
- stringBuffer.append(input.getExtendedMetadata().getName(subFeature));
- stringBuffer.append(TEXT_34);
- stringBuffer.append(subFeature.getEType().getName());
- stringBuffer.append(TEXT_35);
- stringBuffer.append(subFeature.getEType().getName());
- stringBuffer.append(TEXT_36);
- stringBuffer.append(input.getPrefix(subFeature));
- stringBuffer.append(TEXT_37);
- stringBuffer.append(input.getExtendedMetadata().getName(subFeature));
- stringBuffer.append(TEXT_38);
}
- stringBuffer.append(TEXT_39);
+ stringBuffer.append(TEXT_34);
} else {
- stringBuffer.append(TEXT_40);
+ stringBuffer.append(TEXT_35);
stringBuffer.append(input.getPrefix(feature));
- stringBuffer.append(TEXT_41);
+ stringBuffer.append(TEXT_17);
stringBuffer.append(input.getExtendedMetadata().getName(feature));
- stringBuffer.append(TEXT_42);
+ stringBuffer.append(TEXT_36);
stringBuffer.append(feature.getEType().getName());
- stringBuffer.append(TEXT_43);
+ stringBuffer.append(TEXT_37);
stringBuffer.append(feature.getEType().getName());
- stringBuffer.append(TEXT_44);
+ stringBuffer.append(TEXT_38);
stringBuffer.append(input.getPrefix(feature));
- stringBuffer.append(TEXT_45);
+ stringBuffer.append(TEXT_17);
stringBuffer.append(input.getExtendedMetadata().getName(feature));
- stringBuffer.append(TEXT_46);
+ stringBuffer.append(TEXT_23);
}
- stringBuffer.append(TEXT_47);
+ stringBuffer.append(TEXT_39);
} }
if("Definitions".equals(c.getName())){
- stringBuffer.append(TEXT_48);
+ stringBuffer.append(TEXT_40);
}
- stringBuffer.append(TEXT_49);
+ stringBuffer.append(TEXT_41);
}
- stringBuffer.append(TEXT_50);
- stringBuffer.append(TEXT_51);
+ stringBuffer.append(TEXT_42);
+ stringBuffer.append(TEXT_43);
return stringBuffer.toString();
}
}
diff --git a/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMLToXMI.java b/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMLToXMI.java
index 1b71ad5..c94e6ea 100644
--- a/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMLToXMI.java
+++ b/org.eclipse.bpmn2.tools.xsltFromEcore/src/org/eclipse/bpmn2/tools/xsltFromEcore/jet/XMLToXMI.java
@@ -43,36 +43,32 @@
protected final String TEXT_8 = "\"> <xsl:value-of select=\"";
protected final String TEXT_9 = "\" /> </xsl:attribute></xsl:if>\t\t\t";
protected final String TEXT_10 = NL + " <xsl:if test=\"";
- protected final String TEXT_11 = "\"><xsl:attribute name=\"";
- protected final String TEXT_12 = "\"><xsl:call-template name=\"concat\"><xsl:with-param name=\"nodeset\" select=\"";
- protected final String TEXT_13 = "\"/></xsl:call-template></xsl:attribute></xsl:if>\t\t\t";
- protected final String TEXT_14 = NL + "\t</xsl:template>" + NL + "" + NL + "\t<xsl:template name=\"";
- protected final String TEXT_15 = "Template\">";
- protected final String TEXT_16 = NL + "\t <xsl:call-template name=\"";
- protected final String TEXT_17 = "Template\"/> ";
- protected final String TEXT_18 = NL + " <xsl:for-each select=\"";
- protected final String TEXT_19 = "\">";
- protected final String TEXT_20 = NL + " <xsl:choose>\t\t";
- protected final String TEXT_21 = " " + NL + " <xsl:when test=\"self::";
- protected final String TEXT_22 = "\">" + NL + " <";
- protected final String TEXT_23 = " xmi:type=\"";
- protected final String TEXT_24 = "xmi:";
- protected final String TEXT_25 = "\">\t\t\t " + NL + "\t <xsl:call-template name=\"";
- protected final String TEXT_26 = "AttributesTemplate\"/> " + NL + "\t\t\t <xsl:call-template name=\"";
- protected final String TEXT_27 = "Template\" />\t\t\t " + NL + "\t\t\t</";
- protected final String TEXT_28 = ">" + NL + " </xsl:when >";
- protected final String TEXT_29 = NL + " </xsl:choose>";
- protected final String TEXT_30 = NL + " <";
- protected final String TEXT_31 = " xmi:type=\"";
- protected final String TEXT_32 = "xmi:";
- protected final String TEXT_33 = "\">\t\t\t " + NL + "\t <xsl:call-template name=\"";
- protected final String TEXT_34 = "AttributesTemplate\"/> " + NL + " <xsl:call-template name=\"";
- protected final String TEXT_35 = "Template\" />\t\t\t " + NL + " </";
- protected final String TEXT_36 = ">";
- protected final String TEXT_37 = NL + " </xsl:for-each>";
- protected final String TEXT_38 = NL + "\t</xsl:template>" + NL + " ";
- protected final String TEXT_39 = NL + "</xsl:stylesheet>";
- protected final String TEXT_40 = NL;
+ protected final String TEXT_11 = "\"><xsl:call-template name=\"concat\"><xsl:with-param name=\"nodeset\" select=\"";
+ protected final String TEXT_12 = "\"/></xsl:call-template></xsl:attribute></xsl:if>\t\t\t";
+ protected final String TEXT_13 = NL + "\t</xsl:template>" + NL + "" + NL + "\t<xsl:template name=\"";
+ protected final String TEXT_14 = "Template\">";
+ protected final String TEXT_15 = "Template\"/> ";
+ protected final String TEXT_16 = NL + " <xsl:for-each select=\"";
+ protected final String TEXT_17 = "\">";
+ protected final String TEXT_18 = NL + " <xsl:choose>\t\t";
+ protected final String TEXT_19 = " " + NL + " <xsl:when test=\"self::";
+ protected final String TEXT_20 = "\">" + NL + " <";
+ protected final String TEXT_21 = " xmi:type=\"";
+ protected final String TEXT_22 = "xmi:";
+ protected final String TEXT_23 = "\">\t\t\t " + NL + "\t <xsl:call-template name=\"";
+ protected final String TEXT_24 = "AttributesTemplate\"/> " + NL + "\t\t\t <xsl:call-template name=\"";
+ protected final String TEXT_25 = "Template\" />\t\t\t " + NL + "\t\t\t</";
+ protected final String TEXT_26 = ">" + NL + " </xsl:when >";
+ protected final String TEXT_27 = NL + " </xsl:choose>";
+ protected final String TEXT_28 = NL + " <";
+ protected final String TEXT_29 = "\">\t\t\t " + NL + "\t <xsl:call-template name=\"";
+ protected final String TEXT_30 = "AttributesTemplate\"/> " + NL + " <xsl:call-template name=\"";
+ protected final String TEXT_31 = "Template\" />\t\t\t " + NL + " </";
+ protected final String TEXT_32 = ">";
+ protected final String TEXT_33 = NL + " </xsl:for-each>";
+ protected final String TEXT_34 = NL + "\t</xsl:template>" + NL + " ";
+ protected final String TEXT_35 = NL + "</xsl:stylesheet>";
+ protected final String TEXT_36 = NL;
public String generate(Object argument)
{
@@ -100,65 +96,65 @@
for(EStructuralFeature feature: input.getAllFeatureThatAreReferences(c)) {
stringBuffer.append(TEXT_10);
stringBuffer.append(input.getXPathForXml(feature));
- stringBuffer.append(TEXT_11);
+ stringBuffer.append(TEXT_7);
stringBuffer.append(feature.getName() );
- stringBuffer.append(TEXT_12);
+ stringBuffer.append(TEXT_11);
stringBuffer.append(input.getXPathForXml(feature));
- stringBuffer.append(TEXT_13);
+ stringBuffer.append(TEXT_12);
}
- stringBuffer.append(TEXT_14);
+ stringBuffer.append(TEXT_13);
stringBuffer.append(c.getName());
- stringBuffer.append(TEXT_15);
+ stringBuffer.append(TEXT_14);
for(EClass superClass: c.getESuperTypes()) {
- stringBuffer.append(TEXT_16);
+ stringBuffer.append(TEXT_4);
stringBuffer.append(superClass.getName());
- stringBuffer.append(TEXT_17);
+ stringBuffer.append(TEXT_15);
}
for(EStructuralFeature feature: input.getAllOtherFeaturesInXMI(c)) {
- stringBuffer.append(TEXT_18);
+ stringBuffer.append(TEXT_16);
stringBuffer.append(input.getSubFeaturesXPath(feature));
- stringBuffer.append(TEXT_19);
+ stringBuffer.append(TEXT_17);
if(input.hasSubFeatures(feature)){
- stringBuffer.append(TEXT_20);
+ stringBuffer.append(TEXT_18);
for(EStructuralFeature subFeature: input.getAllSubFeatures(feature)) {
- stringBuffer.append(TEXT_21);
+ stringBuffer.append(TEXT_19);
stringBuffer.append(input.getXPathForXml(subFeature));
- stringBuffer.append(TEXT_22);
+ stringBuffer.append(TEXT_20);
stringBuffer.append(feature.getName());
- stringBuffer.append(TEXT_23);
+ stringBuffer.append(TEXT_21);
stringBuffer.append(input.getPrefix(subFeature));
+ stringBuffer.append(TEXT_22);
+ stringBuffer.append(subFeature.getEType().getName());
+ stringBuffer.append(TEXT_23);
+ stringBuffer.append(subFeature.getEType().getName());
stringBuffer.append(TEXT_24);
stringBuffer.append(subFeature.getEType().getName());
stringBuffer.append(TEXT_25);
- stringBuffer.append(subFeature.getEType().getName());
+ stringBuffer.append(feature.getName());
stringBuffer.append(TEXT_26);
- stringBuffer.append(subFeature.getEType().getName());
+ }
stringBuffer.append(TEXT_27);
- stringBuffer.append(feature.getName());
- stringBuffer.append(TEXT_28);
- }
- stringBuffer.append(TEXT_29);
} else {
- stringBuffer.append(TEXT_30);
+ stringBuffer.append(TEXT_28);
stringBuffer.append(feature.getName());
- stringBuffer.append(TEXT_31);
+ stringBuffer.append(TEXT_21);
stringBuffer.append(input.getPrefix(feature));
- stringBuffer.append(TEXT_32);
+ stringBuffer.append(TEXT_22);
stringBuffer.append(feature.getEType().getName());
- stringBuffer.append(TEXT_33);
+ stringBuffer.append(TEXT_29);
stringBuffer.append(feature.getEType().getName());
- stringBuffer.append(TEXT_34);
+ stringBuffer.append(TEXT_30);
stringBuffer.append(feature.getEType().getName());
- stringBuffer.append(TEXT_35);
+ stringBuffer.append(TEXT_31);
stringBuffer.append(feature.getName());
- stringBuffer.append(TEXT_36);
+ stringBuffer.append(TEXT_32);
}
- stringBuffer.append(TEXT_37);
+ stringBuffer.append(TEXT_33);
}
- stringBuffer.append(TEXT_38);
+ stringBuffer.append(TEXT_34);
}
- stringBuffer.append(TEXT_39);
- stringBuffer.append(TEXT_40);
+ stringBuffer.append(TEXT_35);
+ stringBuffer.append(TEXT_36);
return stringBuffer.toString();
}
}
