\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
import org.simantics.proconf.g3d.base.G3DTools;\r
import org.simantics.proconf.g3d.base.MathTools;\r
import org.simantics.proconf.g3d.base.TransformationTools;\r
-import org.simantics.utils.ErrorLogger;\r
+import org.simantics.utils.ui.ErrorLogger;\r
import org.simantics.utils.datastructures.Pair;\r
\r
\r
}\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