X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2FDistrictNetworkUtil.java;h=9bdec1b590367107660947593d32e122d6cddf98;hb=16ee01dc5a40981c58fd5b478b89552e5814e8bb;hp=25503407e66f38f83b49d26dbdcd2334ccd59893;hpb=9dace20146d19dd0541480a80fd289de45b6cfc8;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
index 25503407..9bdec1b5 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
@@ -1,36 +1,64 @@
-package org.simantics.district.network;
-
-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.district.network.ontology.DistrictNetworkResource;
-import org.simantics.layer0.Layer0;
-
-public class DistrictNetworkUtil {
-
-    public static Resource createEdge(WriteGraph graph, Resource composite) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
-        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-        
-        Resource edge = graph.newResource();
-        graph.claim(edge, L0.InstanceOf, DN.Edge);
-        OrderedSetUtils.addFirst(graph, composite, edge);
-        graph.claim(composite, L0.ConsistsOf, L0.PartOf, edge);
-        return edge;
-    }
-    
-    public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
-        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-        DiagramResource DIA = DiagramResource.getInstance(graph);
-        Resource vertex = graph.newResource();
-        graph.claim(vertex, L0.InstanceOf, DN.Vertex);
-        graph.claimLiteral(vertex, DIA.HasLocation, coords);
-        OrderedSetUtils.addFirst(graph, composite, vertex);
-        graph.claim(composite, L0.ConsistsOf, L0.PartOf, vertex);
-        
-        return vertex;
-    }
-}
+package org.simantics.district.network;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+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.db.layer0.util.RemoverUtil;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.district.network.ontology.DistrictNetworkResource;
+import org.simantics.layer0.Layer0;
+
+public class DistrictNetworkUtil {
+
+    public static Resource createEdge(WriteGraph graph, Resource composite) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+        
+        Resource edge = graph.newResource();
+        graph.claim(edge, L0.InstanceOf, DN.Edge);
+        OrderedSetUtils.add(graph, composite, edge);
+        graph.claim(composite, L0.ConsistsOf, L0.PartOf, edge);
+        return edge;
+    }
+    
+    public static Resource createVertex(WriteGraph graph, Resource composite, double[] coords) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+        DiagramResource DIA = DiagramResource.getInstance(graph);
+        Resource vertex = graph.newResource();
+        graph.claim(vertex, L0.InstanceOf, DN.Vertex);
+        graph.claimLiteral(vertex, DIA.HasLocation, coords);
+        OrderedSetUtils.add(graph, composite, vertex);
+        graph.claim(composite, L0.ConsistsOf, L0.PartOf, vertex);
+        
+        return vertex;
+    }
+    
+    public static Resource joinVertices(WriteGraph graph, Collection<Resource> vertices) throws DatabaseException {
+        if (vertices.isEmpty())
+            throw new IllegalArgumentException("vertices-collection should not be empty for joining vertices!");
+        DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+        Iterator<Resource> verticeIterator = vertices.iterator();
+        Resource master = verticeIterator.next();
+        while (verticeIterator.hasNext()) {
+            Resource slave = verticeIterator.next();
+            Resource composite = graph.getSingleObject(slave, Layer0.getInstance(graph).PartOf);
+            Collection<Resource> startVertexEdges = graph.getObjects(slave, DN.HasStartVertex_Inverse);
+            for (Resource startVertexEdge : startVertexEdges) {
+                graph.deny(startVertexEdge, DN.HasStartVertex);
+                graph.claim(startVertexEdge, DN.HasStartVertex, master);
+            }
+            Collection<Resource> endVertexEdges = graph.getObjects(slave, DN.HasEndVertex_Inverse);
+            for (Resource endVertexEdge : endVertexEdges) {
+                graph.deny(endVertexEdge, DN.HasEndVertex);
+                graph.claim(endVertexEdge, DN.HasEndVertex, master);
+            }
+            OrderedSetUtils.remove(graph, composite, slave);
+        }
+        return master;
+    }
+}