X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FLayer0Utils.java;h=936eb58126f0b30563406cd404e1872889d54759;hp=adc51c16d88ef0f74f1f849f421e9156398c69f1;hb=c2c14cfce252493d4fda9f7cf34a981dfe744432;hpb=c26409b1caf2f1e560d37c5befd11b442399c3fe

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
index adc51c16d..936eb5812 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
@@ -106,6 +106,7 @@ import org.simantics.graph.db.TransferableGraphs;
 import org.simantics.graph.diff.Diff;
 import org.simantics.graph.diff.TransferableGraphDelta1;
 import org.simantics.graph.refactoring.GraphRefactoringUtils;
+import org.simantics.graph.representation.PrettyPrintTG;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.layer0.Layer0;
 import org.simantics.operation.Layer0X;
@@ -568,16 +569,16 @@ public class Layer0Utils {
 
 	}
 
-	public static void claimAdaptedValue(WriteGraph graph, Resource objectResource, Object value, Binding binding, Datatype datatype) throws DatabaseException {
+	public static void claimAdaptedValue(WriteGraph graph, Resource objectResource, Object value, Binding binding, Datatype targetDatatype) throws DatabaseException {
 
 		try {
 
-			Datatype source = binding.type();
-			if(source.equals(datatype)) {
+			Datatype sourceDatatype = binding.type();
+			if(sourceDatatype.equals(targetDatatype)) {
 				graph.claimValue(objectResource, value, binding);
 			} else {
-				Binding target = Bindings.getBinding(datatype);
-				Adapter adapter = Bindings.getAdapter(binding, target);
+				Binding target = Bindings.getBinding(targetDatatype);
+				Adapter adapter = Bindings.getTypeAdapter(binding, target);
 				graph.claimValue(objectResource, adapter.adapt(value), target);
 			}
 
@@ -1193,7 +1194,7 @@ public class Layer0Utils {
 
     }
 
-    private static TransferableGraphSource makeTGSource(ReadGraph graph, Resource r) throws DatabaseException {
+    public static TransferableGraphSource makeTGSource(ReadGraph graph, Resource r) throws DatabaseException {
 
     	SimanticsClipboardImpl cp = new SimanticsClipboardImpl();
     	CopyHandler c1 = graph.adapt(r, CopyHandler.class);
@@ -1378,4 +1379,12 @@ public class Layer0Utils {
     	
     }
 
+    public static String prettyPrintResource(ReadGraph graph, Resource resource, boolean ignoreIdentifiers) throws Exception {
+        TransferableGraphSource source = makeTGSource(graph, resource);
+        TransferableGraph1 tg = TransferableGraphs.create(graph, source);
+        GraphRefactoringUtils.fixOntologyExport(tg);
+        System.out.println("Printing resoure " + graph.getURI(resource));
+        return PrettyPrintTG.print(tg, ignoreIdentifiers);
+    }
+
 }