Adding org.simantics.district.geotools plugin

[simantics/district.git] / org.simantics.district.network / src / org / simantics / district / network / DistrictNetworkUtil.java

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 6155bf6fade9face371879bcd4ed246094991a3e..9f6f46fa6de2efc150e4b962e0d62e265c25e321 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/DistrictNetworkUtil.java
@@ -10,12 +10,12 @@ 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.synchronization.graph.AddElement;
 import org.simantics.diagram.synchronization.graph.DiagramGraphUtil;
 import org.simantics.diagram.synchronization.graph.layer.GraphLayer;
 import org.simantics.diagram.synchronization.graph.layer.IGraphLayerUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.layer0.Layer0;
+import org.simantics.operation.Layer0X;
 
 public class DistrictNetworkUtil {
 
@@ -32,7 +32,7 @@ public class DistrictNetworkUtil {
         OrderedSetUtils.add(graph, composite, edge);
         graph.claim(composite, L0.ConsistsOf, L0.PartOf, edge);
         
-        AddElement.claimFreshElementName(graph, composite, edge);
+        claimFreshElementName(graph, composite, edge);
         return edge;
     }
     
@@ -54,7 +54,7 @@ public class DistrictNetworkUtil {
         OrderedSetUtils.add(graph, composite, vertex);
         graph.claim(composite, L0.ConsistsOf, L0.PartOf, vertex);
         
-        AddElement.claimFreshElementName(graph, composite, vertex);
+        claimFreshElementName(graph, composite, vertex);
         
         // We need to put GraphLayer to newLayers so...
         for (Resource layer : graph.getObjects(composite, DiagramResource.getInstance(graph).HasLayer)) {
@@ -89,6 +89,8 @@ public class DistrictNetworkUtil {
                 graph.claim(endVertexEdge, DN.HasEndVertex, master);
             }
             OrderedSetUtils.remove(graph, composite, slave);
+            // Remove ConsistsOf statement
+            graph.deny(composite, Layer0.getInstance(graph).ConsistsOf, slave);
         }
         return master;
     }
@@ -109,4 +111,21 @@ public class DistrictNetworkUtil {
         
         return crsClass.calculateDistance(startCoords, endCoords);
     }
+    
+    public static final String claimFreshElementName(WriteGraph graph, Resource diagram, Resource element) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(graph);
+        DiagramResource DIA = DiagramResource.getInstance(graph);
+        // Get name prefix from diagram
+        String namePrefix = graph.getPossibleRelatedValue2(diagram, Layer0X.getInstance(graph).HasGeneratedNamePrefix);
+        if (namePrefix == null)
+            namePrefix = "";
+        // Give running name to element and increment the counter attached to the diagram.
+        Long l = graph.getPossibleRelatedValue(diagram, DIA.HasModCount, Bindings.LONG);
+        if (l == null)
+            l = Long.valueOf(0L);
+        String name = namePrefix + l.toString();
+        graph.claimLiteral(element, L0.HasName, name, Bindings.STRING);
+        graph.claimLiteral(diagram, DIA.HasModCount, ++l, Bindings.LONG);
+        return name;
+    }
 }