X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.proconf.processeditor%2Fsrc%2Forg%2Fsimantics%2Fprocesseditor%2Fcommon%2FControlPointTools.java;fp=org.simantics.proconf.processeditor%2Fsrc%2Forg%2Fsimantics%2Fprocesseditor%2Fcommon%2FControlPointTools.java;h=7584374f333e86468540c714c02de1b639b8c11d;hb=c58f0db363a3f2881577f84fb905e07775f65002;hp=c8e906c4faf1ea94c95fa36f44653b778a1c8b04;hpb=f20a7d62827580fd7b4c1c1dd3cc5feb20c0667b;p=simantics%2F3d.git

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 c8e906c4..7584374f 100644
--- 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;
 
 import org.simantics.db.Graph;
 import org.simantics.db.Resource;
+import org.simantics.db.Session;
 import org.simantics.layer0.utils.EntityFactory;
 import org.simantics.layer0.utils.IEntity;
 import org.simantics.processeditor.ProcessResource;
@@ -1039,21 +1040,23 @@ public class ControlPointTools {
     }
     
     static boolean isControlPointChanged(PipeControlPoint node) {
-    	long id = node.getResource().getResourceId();
+    	Session session = node.getGraph().getSession();
+    	long id = node.getResource().getResourceId(session);
+    	
     	boolean changed = updatePosition(node);
         //if (!changed) {
         	if (node.isInstanceOf(ProcessResource.plant3Dresource.PathLegEndControlPoint)) {
         		if (node.isInstanceOf(ProcessResource.plant3Dresource.TurnControlPoint)) {
-        			Pair<Long,Long> connected = (Pair<Long,Long>)getProperty(node.getResource().getResourceId());
+        			Pair<Long,Long> connected = (Pair<Long,Long>)getProperty(node.getResource().getResourceId(session));
                     PipeControlPoint next = node.getNext();
                     PipeControlPoint prev = node.getPrevious();
                     if ((next != null && prev != null) && (
                         connected == null || 
                        (connected.first == null && prev != null) ||
                        (connected.second == null && next != null) ||
-                        !connected.first.equals(prev.getResource().getResourceId()) ||
-                        !connected.second.equals(next.getResource().getResourceId()))) {
-                    	storeProperty(id, new Pair<Long,Long>(prev.getResource().getResourceId(),next.getResource().getResourceId()));
+                        !connected.first.equals(prev.getResource().getResourceId(session)) ||
+                        !connected.second.equals(next.getResource().getResourceId(session)))) {
+                    	storeProperty(id, new Pair<Long,Long>(prev.getResource().getResourceId(session),next.getResource().getResourceId(session)));
                         changed = true;  
                     }
                     if (node.isInstanceOf(ProcessResource.plant3Dresource.VariableAngleTurnControlPoint)) {