X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Feditor%2FP3DContentOutlinePage.java;h=5a9e8b01e32cf899a1e452cc7c4420737c30728f;hb=24ef19cca93feb0306bca916c0506280c79bada0;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..5a9e8b01 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; @@ -27,7 +30,7 @@ import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint; public class P3DContentOutlinePage extends VTKContentOutlinePage{ - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; protected Menu contextMenu; private LocalResourceManager manager = new LocalResourceManager(JFaceResources.getResources()); @@ -56,11 +59,16 @@ public class P3DContentOutlinePage extends VTKContentOutlinePage list = new ArrayList(); + list.addAll(((PipeRun)parentElement).getControlPoints()); + list.addAll(((PipeRun)parentElement).getSortedChild()); + return list.toArray(); + } + return ((PipeRun)parentElement).getSortedChild().toArray(); + } + if (DEBUG) { if (parentElement instanceof PipelineComponent) { return new Object[]{((PipelineComponent) parentElement).getControlPoint()}; } else if (parentElement instanceof PipeControlPoint) {