X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Feditor%2FPlant3DEditor.java;h=21b99bfb74f109b5b910e5d86c19bdf8deda9531;hb=8da9a6a979f4513be2e0ab5533acc5e4763cf00e;hp=b1bb5000995c394503504c3a3aa54a68bea3ab25;hpb=84132a1d750c45f9161afbd58b78572964e50d26;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
index b1bb5000..21b99bfb 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
@@ -158,39 +158,8 @@ public class Plant3DEditor extends ResourceEditorPart {
 					// update control points.
 					// TODO : this should be optimized.
 					try {
-						for (INode node : rootNode.getChild()) {
-							if (node instanceof PipeRun) {
-								for (PipelineComponent pc : ((PipeRun) node).getChild())
-									pc.sync();
-							} else if (node instanceof Equipment) {
-								for (PipelineComponent pc : ((Equipment) node).getChild())
-									pc.sync();
-							}
-						}
-						
-						for (INode node : rootNode.getChild()) {
-							if (node instanceof PipeRun) {
-								for (PipelineComponent pc : ((PipeRun) node).getChild())
-									pc.sync2();
-							} else if (node instanceof Equipment) {
-								for (PipelineComponent pc : ((Equipment) node).getChild())
-									pc.sync2();
-							}
-						}
-						for (INode node : rootNode.getChild()) {
-							if (node instanceof PipeRun) {
-								PipingRules.validate((PipeRun)node);
-							}
-						}
-						PipingRules.setEnabled(true);
-						for (INode node : rootNode.getChild()) {
-							if (node instanceof PipeRun) {
-								PipeRun run = (PipeRun)node;
-								for (PipeControlPoint pcp : run.getControlPoints())
-									PipingRules.positionUpdate(pcp);
-									
-							}
-						}
+					    P3DUtil.finalizeDBLoad(rootNode);
+					    
 					} catch (Exception e) {
 						throw new DatabaseException(e);
 					}
@@ -353,9 +322,11 @@ public class Plant3DEditor extends ResourceEditorPart {
 						m.add(add);
 					}
 				} else if (node instanceof Nozzle) {
-					m.add(translateAction);
-					m.add(rotateAction);
-					Nozzle nozzle = (Nozzle)node;
+				    Nozzle nozzle = (Nozzle)node;
+				    if (!nozzle.isFixed()) {
+				        m.add(translateAction);
+	                    m.add(rotateAction);
+				    }
 					m.add(routePipeAction);
 					routePipeAction.setComponent(nozzle);
 					routePipeAction.setEnabled(nozzle.getNext() == null && nozzle.getPrevious() == null);