From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Tue, 13 Aug 2019 15:45:24 +0000 (+0300)
Subject: Show components in connected order in outline with debug mode
X-Git-Tag: v1.43.0~226^2~1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=eca4b77e481a78da57ceb201453c61362e4bdba2;hp=9a39fbf9e01c46b859b6c695930081b0eb6b2842;p=simantics%2F3d.git

Show components in connected order in outline with debug mode

gitlab #19

Change-Id: I9a82db4e4a91ea3fb2b3279431c3867e6b0ddd57
---

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..0c5ab5df 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;
@@ -56,11 +59,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();
-					}
-				} else {
+				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();
+				    }
+				    return ((PipeRun)parentElement).getSortedChild().toArray();
+                }
+				if (DEBUG) {
 					if (parentElement instanceof PipelineComponent) {
 						return new Object[]{((PipelineComponent) parentElement).getControlPoint()};
 					} else if (parentElement instanceof PipeControlPoint) {