XML Elements are exported in the original order (if order is stored during import)

[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 646773472100b2467267be71a2d2ea3ae47d540a..b6b4fedbe0218e435fc157e180d4c7a90fbff6cf 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
@@ -73,24 +73,24 @@ public abstract class JavaGenerator extends SchemaConversionBase{
                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
+//     @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
        @Override\r
        protected void handle(SchemaObject parent, SchemaElement indicator, List<SchemaElement> elements) {\r
@@ -106,10 +106,12 @@ public abstract class JavaGenerator extends SchemaConversionBase{
                                if (localElement.getName() != null) {\r
                                        QName refType = localElement.getType();\r
                                        if (refType != null)\r
-                                               handleIndicator(parent, indicator, e, false, name, refType);\r
+                                               //handleIndicator(parent, indicator, e, false, name, refType);\r
+                                               handleIndicator(parent, indicator, e, name, RefType.Type);\r
                                } else if (localElement.getRef() != null) {\r
-                                       QName refType = localElement.getRef();\r
-                                       handleIndicator(parent, indicator, e, true, name, refType);\r
+                                       //QName refType = localElement.getRef();\r
+                                       //handleIndicator(parent, indicator, e, true, name, refType);\r
+                                       handleIndicator(parent, indicator, e, name, RefType.Reference);\r
                                }\r
                        }\r
                }\r