Combination of Simantics-platform related changes and fixes for district

[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / svg / CreateSVGElement.java

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/svg/CreateSVGElement.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/svg/CreateSVGElement.java
index 411f61c6bdd2bc671b508583bf4efe9297e932e7..1f302a64db4c2b7262339366bdb438123e7b3d11 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/svg/CreateSVGElement.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/svg/CreateSVGElement.java
@@ -1,68 +1,75 @@
-package org.simantics.modeling.svg;\r
-\r
-import java.io.File;\r
-import java.io.IOException;\r
-\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.WriteGraph;\r
-import org.simantics.db.common.utils.OrderedSetUtils;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.diagram.stubs.DiagramResource;\r
-import org.simantics.diagram.stubs.G2DResource;\r
-import org.simantics.diagram.synchronization.graph.AddElement;\r
-import org.simantics.image2.ontology.ImageResource;\r
-import org.simantics.layer0.Layer0;\r
-import org.simantics.layer0.utils.direct.GraphUtils;\r
-import org.simantics.utils.FileUtils;\r
-\r
-public class CreateSVGElement {\r
-\r
-    public static void createSVGElement(WriteGraph g, Resource diagram, String suffix, byte[] data, double mposX, double mposY) throws DatabaseException {\r
-\r
-        Layer0 L0 = Layer0.getInstance(g);\r
-        DiagramResource DIA = DiagramResource.getInstance(g);\r
-        ImageResource IMAGE = ImageResource.getInstance(g);\r
-        G2DResource G2D = G2DResource.getInstance(g);\r
-\r
-        Resource element;\r
-        if("svg".equals(suffix)) {\r
-            Resource transform = GraphUtils.create(g, L0.InstanceOf, G2D.Transform);\r
-            g.claimValue(transform, new double[] {1.0, 0.0, 0.0, 1.0, mposX, mposY}, Bindings.DOUBLE_ARRAY);\r
-            element = GraphUtils.create(g,\r
-                    L0.InstanceOf, DIA.SVGElement,\r
-                    G2D.HasSVGDocument, new String(data),\r
-                    DIA.HasTransform, transform);\r
-            AddElement.claimFreshElementName(g, diagram, element);\r
-        } else if ("png".equals(suffix)) {\r
-            Resource transform = GraphUtils.create(g, L0.InstanceOf, G2D.Transform);\r
-            g.claimValue(transform, new double[] {1.0, 0.0, 0.0, 1.0, mposX, mposY}, Bindings.DOUBLE_ARRAY);\r
-            Resource image = g.newResource();\r
-            g.claim(image, L0.InstanceOf, IMAGE.PngImage);\r
-            g.claimValue(image, data, Bindings.BYTE_ARRAY);\r
-            element = GraphUtils.create(g,\r
-                    L0.InstanceOf, DIA.RasterElement,\r
-                    G2D.HasRasterImage, image,\r
-                    DIA.HasTransform, transform);\r
-            AddElement.claimFreshElementName(g, diagram, element);\r
-        }\r
-        else\r
-            throw new DatabaseException("Unknown image format " + suffix);\r
-        OrderedSetUtils.addFirst(g, diagram, element);\r
-        g.claim(diagram, L0.ConsistsOf, element);\r
-\r
-    }\r
-    \r
-    public static void importSVGElement(WriteGraph graph, Resource diagram, File file, double posX, double posY) throws DatabaseException, IOException {\r
-        \r
-        final byte[] data = FileUtils.readFile(file);\r
-        createSVGElement(graph, diagram, suffix(file.getName()), data, posX, posY);\r
-    }\r
-    \r
-    private static String suffix(String fileName) {\r
-        int len = fileName.length();\r
-        if(len < 3) return null;\r
-        else return fileName.substring(len-3,len).toLowerCase();\r
-    }\r
-    \r
-}\r
+package org.simantics.modeling.svg;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.db.Resource;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.utils.OrderedSetUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.diagram.stubs.G2DResource;
+import org.simantics.diagram.synchronization.graph.AddElement;
+import org.simantics.image2.ontology.ImageResource;
+import org.simantics.layer0.Layer0;
+import org.simantics.layer0.utils.direct.GraphUtils;
+import org.simantics.utils.FileUtils;
+
+public class CreateSVGElement {
+
+    public static void createSVGElement(WriteGraph g, Resource diagram, String suffix, byte[] data, double mposX, double mposY) throws DatabaseException {
+        createSVGElement(g, diagram, suffix, data, mposX, mposY);
+    }
+
+    public static Resource createSVGElementR(WriteGraph g, Resource diagram, String suffix, byte[] data, double mposX, double mposY) throws DatabaseException {
+
+        Layer0 L0 = Layer0.getInstance(g);
+        DiagramResource DIA = DiagramResource.getInstance(g);
+        ImageResource IMAGE = ImageResource.getInstance(g);
+        G2DResource G2D = G2DResource.getInstance(g);
+
+        Resource element;
+        if("svg".equals(suffix)) {
+            Resource transform = GraphUtils.create(g, L0.InstanceOf, G2D.Transform);
+            g.claimValue(transform, new double[] {1.0, 0.0, 0.0, 1.0, mposX, mposY}, Bindings.DOUBLE_ARRAY);
+            element = GraphUtils.create(g,
+                    L0.InstanceOf, DIA.SVGElement,
+                    G2D.HasSVGDocument, new String(data),
+                    DIA.HasTransform, transform);
+            AddElement.claimFreshElementName(g, diagram, element);
+        } else if ("png".equals(suffix)) {
+            Resource transform = GraphUtils.create(g, L0.InstanceOf, G2D.Transform);
+            g.claimValue(transform, new double[] {1.0, 0.0, 0.0, 1.0, mposX, mposY}, Bindings.DOUBLE_ARRAY);
+            Resource image = g.newResource();
+            g.claim(image, L0.InstanceOf, IMAGE.PngImage);
+            g.claimValue(image, data, Bindings.BYTE_ARRAY);
+            element = GraphUtils.create(g,
+                    L0.InstanceOf, DIA.RasterElement,
+                    G2D.HasRasterImage, image,
+                    DIA.HasTransform, transform);
+            AddElement.claimFreshElementName(g, diagram, element);
+        }
+        else
+            throw new DatabaseException("Unknown image format " + suffix);
+        OrderedSetUtils.addFirst(g, diagram, element);
+        g.claim(diagram, L0.ConsistsOf, element);
+        return element;
+    }
+
+    public static void importSVGElement(WriteGraph graph, Resource diagram, File file, double posX, double posY) throws DatabaseException, IOException {
+        importSVGElementR(graph, diagram, file, posX, posY);
+    }
+
+    public static Resource importSVGElementR(WriteGraph graph, Resource diagram, File file, double posX, double posY) throws DatabaseException, IOException {
+        final byte[] data = FileUtils.readFile(file);
+        return createSVGElementR(graph, diagram, suffix(file.getName()), data, posX, posY);
+    }
+
+    private static String suffix(String fileName) {
+        int len = fileName.length();
+        if(len < 3) return null;
+        else return fileName.substring(len-3,len).toLowerCase();
+    }
+
+}