X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Feditor%2FP3DContentOutlinePage.java;h=893a07300cd2c95db095123c3794e7dbfdf53a54;hb=8792531e8f0967aee36cdd405ec0cd3a34f9ab06;hp=160188e60c64c29303d8a7ecc9fd78d38e9388d7;hpb=0fb61ee28592dc5df41a4c7aae9913044313ee21;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java
index 160188e6..893a0730 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java
@@ -1,5 +1,8 @@
 package org.simantics.plant3d.editor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
@@ -16,6 +19,7 @@ import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.g3d.vtk.common.NodeSelectionProvider2;
 import org.simantics.g3d.vtk.common.VTKContentOutlinePage;
 import org.simantics.plant3d.Activator;
+import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.EndComponent;
 import org.simantics.plant3d.scenegraph.Equipment;
 import org.simantics.plant3d.scenegraph.Nozzle;
@@ -25,7 +29,7 @@ import org.simantics.plant3d.scenegraph.PipelineComponent;
 import org.simantics.plant3d.scenegraph.TurnComponent;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
 
-public class P3DContentOutlinePage extends VTKContentOutlinePage<Resource, Object>{
+public class P3DContentOutlinePage extends VTKContentOutlinePage<Resource, INode>{
 	
 	private static final boolean DEBUG = false;
 	protected Menu contextMenu;
@@ -38,7 +42,7 @@ public class P3DContentOutlinePage extends VTKContentOutlinePage<Resource, Objec
 	private Image elbowImage;
 	private Image componentImage;
 	
-	public  P3DContentOutlinePage(ParentNode<? extends INode> rootNode, NodeSelectionProvider2<Resource,Object> provider) {
+	public  P3DContentOutlinePage(ParentNode<? extends INode> rootNode, NodeSelectionProvider2<Resource,INode> provider) {
 		super(rootNode,provider);
 		
 		nozzleImage = manager.createImage(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/Nozzle.png"));
@@ -56,11 +60,16 @@ public class P3DContentOutlinePage extends VTKContentOutlinePage<Resource, Objec
 				if (parentElement instanceof P3DRootNode) {
 					return ((P3DRootNode)parentElement).getChild().toArray();
 				}
-				if (!DEBUG) {
-					if (parentElement instanceof PipeRun) {
-						return ((PipeRun)parentElement).getSortedChild().toArray();
+				if (parentElement instanceof PipeRun) {
+					if (DEBUG) {
+						List<Object> list = new ArrayList<Object>();
+						list.addAll(((PipeRun)parentElement).getControlPoints());
+						list.addAll(((PipeRun)parentElement).getSortedChild());
+						return list.toArray();
 					}
-				} else {
+					return ((PipeRun)parentElement).getSortedChild().toArray();
+				}
+				if (DEBUG) {
 					if (parentElement instanceof PipelineComponent) {
 						return new Object[]{((PipelineComponent) parentElement).getControlPoint()};
 					} else if (parentElement instanceof PipeControlPoint) {
@@ -109,6 +118,18 @@ public class P3DContentOutlinePage extends VTKContentOutlinePage<Resource, Objec
 		
 	}
 	
+	@Override
+	public void propertyChanged(INode node, String id) {
+	    // TODO Auto-generated method stub
+	    if (node instanceof PipelineComponent) {
+	        if (Plant3D.URIs.HasNext.equals(id) || Plant3D.URIs.HasPrevious.equals(id)) {
+	            refershViewer(node.getParent());
+	            return;
+	        }
+	    }
+	    super.propertyChanged(node, id);
+	}
+	
 	@Override
 	public void dispose() {
 		manager.dispose();
@@ -116,14 +137,14 @@ public class P3DContentOutlinePage extends VTKContentOutlinePage<Resource, Objec
 	}
 	
 	protected void hookContextMenu(TreeViewer viewer) {
-        MenuManager menuMgr = new MenuManager("#PopupMenu");
-        menuMgr.setRemoveAllWhenShown(true);
-        menuMgr.addMenuListener(new IMenuListener() {
-            public void menuAboutToShow(IMenuManager manager) {
-            	createContextMenu(manager);
-            }
-        });
-        contextMenu = menuMgr.createContextMenu(viewer.getTree());
+		MenuManager menuMgr = new MenuManager("#PopupMenu");
+		menuMgr.setRemoveAllWhenShown(true);
+		menuMgr.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager manager) {
+				createContextMenu(manager);
+			}
+		});
+		contextMenu = menuMgr.createContextMenu(viewer.getTree());
 	}
 	
 	protected void createContextMenu(IMenuManager manager) {