Initial support for XML export (order of Elements is not kept)

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

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
index 095de9d2c20049a9f543fdae21459ebc8ef1dc91..287156299dfe0213ee43f5f858ec44afd29ad04a 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
@@ -37,20 +37,22 @@ public class OntologyGenerator extends SchemaConversionBase {
        String commentTag = "//";\r
        \r
        Schema schema;\r
-       \r
+       String ontologyName;\r
        String className;\r
        \r
        SchemaConverter converter;\r
        \r
        PrintWriter writer = null;\r
        \r
-       public String getClassName() {\r
-               return className;\r
-       }\r
        \r
-       public void createOntology(Schema schema, SchemaConverter converter) throws FileNotFoundException {\r
+       \r
+       \r
+       \r
+       public void createOntology(Schema schema, String ontologyName, String className, SchemaConverter converter) throws FileNotFoundException {\r
                this.schema = schema;\r
                this.converter = converter;\r
+               this.ontologyName = ontologyName;\r
+               this.className = className;\r
                \r
 //             for (OpenAttrs attrs : schema.getIncludeOrImportOrRedefine()) {\r
 //                     if (attrs instanceof Annotation) {\r
@@ -83,26 +85,13 @@ public class OntologyGenerator extends SchemaConversionBase {
        }\r
        \r
        protected void handle(Schema schema) {\r
-               String ontologyName = schema.getTargetNamespace();\r
-               if (ontologyName == null) {\r
-                       ontologyName = converter.getSchemaFile().getName();\r
-                       \r
-                       int index = ontologyName.lastIndexOf(".");\r
-                       if (index > 0)\r
-                               ontologyName = ontologyName.substring(0, index);\r
-               } \r
-               if (!ontologyName.startsWith("http"))\r
-                       ontologyName = "http://" + ontologyName;\r
                String parts[] = ontologyName.split("/");\r
                String name = parts[parts.length-1];\r
                ontRoot = name.substring(0, Math.min(3, name.length())).toUpperCase();\r
                String version = schema.getVersion();\r
                if (version == null)\r
                        version = "1.0";\r
-               \r
-               name = name.replaceAll("\\.", "_");\r
-               name = name.replaceAll(" ", "_");\r
-               className = converter.getPluginName() + "." + name;\r
+\r
                \r
                for (String s : converter.getHeader()) {\r
                        writer.println(commentTag + " " + s);   \r
@@ -467,11 +456,8 @@ public class OntologyGenerator extends SchemaConversionBase {
                Element element = elementObj.getElement();\r
                String name = getName(elementObj);//element.getName();\r
                \r
-//             if ("Presentation".equals(name))\r
-//                     System.out.println();\r
-\r
-//             if (parent != null)\r
-//                     name = parent +"_"+name;\r
+               if ("Text".equals(name))\r
+                       System.out.println();\r
                \r
                String type = "XML.Element";\r
                Set<String> types = new LinkedHashSet<String>();\r