X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;h=121a6352b8e73401ad894c00b90add2e29083c7d;hb=04f3fb6796cd6225be090e1e1feb866ae0d03173;hp=dc82a9fdf16542e8923d156deb42e0f539268d80;hpb=f11cbe76b3f4be142c9f84ef9a7b6bc9dcc8ff23;p=simantics%2Finterop.git

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
index dc82a9f..121a635 100644
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
@@ -337,17 +337,21 @@ public class ExporterGenerator extends JavaGenerator{
 	}
 	
 	@Override
-	protected void createPrimitiveIndicator(SchemaObject parent, String refName, String binding) {
+	protected void createPrimitiveIndicator(SchemaObject parent, String refName, TypeEntry typeEntry, QName typeName) {
 		FileWriter fw = getWriter(parent);
-		//SchemaObject refElement = elementName.get(refType.getLocalPart());
-		//writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");
-		fw.writer.println("        addRelationWriter("+ ontShort +getName(parent) + "_has"+refName+", "+getName(parent) +"_" +refName+".class);");
+		String ontologyClassName = converter.getOntologyClassName(typeName.getNamespaceURI());
+		String typeURI = ontologyClassName != null ? ontologyClassName + ".URIs." + getName(base.getSimpleType(typeName)) : "null";
+		
+		fw.writer.println("      addRelationWriter("+ ontShort +getName(parent) + "_has"+refName+", "+getName(parent) +"_" +refName+".class);");
 		
 		fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementWriter {");
 		fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");
-		//fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");
-		fw.delayedWriter2.println("           super(\""+refName+"\",null, "+binding+");");
-		fw.delayedWriter2.println("       }");
+		fw.delayedWriter2.println("         super(\""+refName+"\", " + typeURI + ", " + typeEntry.binding+");");
+		fw.delayedWriter2.println("      }\n");
+		fw.delayedWriter2.println("      @Override");
+		fw.delayedWriter2.println("      public String decode(Object value) {");
+		fw.delayedWriter2.println("         return " + typeEntry.stringPrefix + "(" + typeEntry.javaType + ")value" + typeEntry.stringPostfix + ";");
+		fw.delayedWriter2.println("      }");
 		fw.delayedWriter2.println("   }");
 	}