Handling ComplexTypes defined with SimpleContent

[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / JavaGenerator.java

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java
index b6b4fedbe0218e435fc157e180d4c7a90fbff6cf..887bd1ec34e3611ccb0d715eaa6fba71d1abc7b2 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java
@@ -72,26 +72,7 @@ public abstract class JavaGenerator extends SchemaConversionBase{
        public static String getAttributeGroupPrefix() {\r
                return "AttributeGroups_";\r
        }\r
-       \r
-//     @Override\r
-//     protected void handle(SchemaObject parent, SchemaElement indicator, SchemaElement element) {\r
-//             Element localElement = element.getElement();\r
-//             if (localElement.getName() != null) {\r
-//                     SchemaObject eObj = elements.get(localElement);\r
-//                     String refName = localElement.getName();\r
-//                     QName refType = localElement.getType();\r
-//                     if (refType != null)\r
-//                             handleIndicator(parent, indicator, element, false, refName, refType);\r
-//                     else {\r
-//                             handleElement(eObj);\r
-//                             handleIndicator(parent, indicator, element, false, refName, localElement);\r
-//                     }\r
-//             } else if (localElement.getRef() != null) {\r
-//                     QName refType = localElement.getRef();\r
-//                     handleIndicator(parent, indicator,element, true, refType.getLocalPart(), refType);\r
-//             }\r
-//     }\r
-       \r
+               \r
        @Override\r
        protected void handle(SchemaObject parent, SchemaElement indicator, List<SchemaElement> elements) {\r
                if (indicator.getType() == SchemaElement.ElementType.SEQUENCE || (indicator.getType() == SchemaElement.ElementType.CHOICE && indicator.getRestriction().many())) {\r
@@ -231,7 +212,7 @@ public abstract class JavaGenerator extends SchemaConversionBase{
                }\r
        }\r
        \r
-       protected void writeClass(PrintWriter writer,boolean abst, String name, String className, String baseClass, List<String> interfaces) {\r
+       protected void writeClass(PrintWriter writer,boolean abst, String elementId, String className, String baseClass, List<String> interfaces) {\r
                writer.println("@SuppressWarnings(\"unused\")");\r
                writer.print("public " +(abst ? "abstract " : "") + "class " + className + " extends "+baseClass);\r
                if (interfaces.size() > 0) {\r
@@ -246,8 +227,8 @@ public abstract class JavaGenerator extends SchemaConversionBase{
                writer.println();\r
                writer.println("   @Override");\r
                writer.println("   public java.lang.String getElementId() {");\r
-               if (name != null)\r
-               writer.println("      return \""+name+"\";");\r
+               if (elementId != null)\r
+               writer.println("      return \""+elementId+"\";");\r
                else // complex types cannot be parsed directly with name/id reference.\r
                writer.println("      return null;");\r
                writer.println("   }");\r