git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@9343 ac1ea38d...

[simantics/3d.git] / org.simantics.proconf.processeditor / src / org / simantics / processeditor / common / ControlPointTools.java

diff --git a/org.simantics.proconf.processeditor/src/org/simantics/processeditor/common/ControlPointTools.java b/org.simantics.proconf.processeditor/src/org/simantics/processeditor/common/ControlPointTools.java
index c8e906c4faf1ea94c95fa36f44653b778a1c8b04..7584374f333e86468540c714c02de1b639b8c11d 100644 (file)
--- a/org.simantics.proconf.processeditor/src/org/simantics/processeditor/common/ControlPointTools.java
+++ b/org.simantics.proconf.processeditor/src/org/simantics/processeditor/common/ControlPointTools.java
@@ -14,6 +14,7 @@ import javax.vecmath.Vector3d;
 \r
 import org.simantics.db.Graph;\r
 import org.simantics.db.Resource;\r
+import org.simantics.db.Session;\r
 import org.simantics.layer0.utils.EntityFactory;\r
 import org.simantics.layer0.utils.IEntity;\r
 import org.simantics.processeditor.ProcessResource;\r
@@ -1039,21 +1040,23 @@ public class ControlPointTools {
     }\r
     \r
     static boolean isControlPointChanged(PipeControlPoint node) {\r
-       long id = node.getResource().getResourceId();\r
+       Session session = node.getGraph().getSession();\r
+       long id = node.getResource().getResourceId(session);\r
+       \r
        boolean changed = updatePosition(node);\r
         //if (!changed) {\r
                if (node.isInstanceOf(ProcessResource.plant3Dresource.PathLegEndControlPoint)) {\r
                        if (node.isInstanceOf(ProcessResource.plant3Dresource.TurnControlPoint)) {\r
-                               Pair<Long,Long> connected = (Pair<Long,Long>)getProperty(node.getResource().getResourceId());\r
+                               Pair<Long,Long> connected = (Pair<Long,Long>)getProperty(node.getResource().getResourceId(session));\r
                     PipeControlPoint next = node.getNext();\r
                     PipeControlPoint prev = node.getPrevious();\r
                     if ((next != null && prev != null) && (\r
                         connected == null || \r
                        (connected.first == null && prev != null) ||\r
                        (connected.second == null && next != null) ||\r
-                        !connected.first.equals(prev.getResource().getResourceId()) ||\r
-                        !connected.second.equals(next.getResource().getResourceId()))) {\r
-                       storeProperty(id, new Pair<Long,Long>(prev.getResource().getResourceId(),next.getResource().getResourceId()));\r
+                        !connected.first.equals(prev.getResource().getResourceId(session)) ||\r
+                        !connected.second.equals(next.getResource().getResourceId(session)))) {\r
+                       storeProperty(id, new Pair<Long,Long>(prev.getResource().getResourceId(session),next.getResource().getResourceId(session)));\r
                         changed = true;  \r
                     }\r
                     if (node.isInstanceOf(ProcessResource.plant3Dresource.VariableAngleTurnControlPoint)) {\r