No insertion of straight pipe in straight pipe

gitlab #127

Change-Id: I2e16805bb406fb940eb327453e746edb324e261d
(cherry picked from commit b1d089b80b2db489b2318ed716b60be8188ab890)

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
index 2911be3619b32b2a6b86720123b3b2ba58ff60fb..dc00915ff0fda09a98493a9c0b67f9c55b97342a 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -3,6 +3,7 @@ package org.simantics.plant3d.dialog;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Set;
 
 import org.eclipse.jface.dialogs.Dialog;
@@ -233,12 +234,22 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 
                ExpandBar expandBar = new ExpandBar(composite, SWT.V_SCROLL);
 
+               boolean isOpen = component.getNext() == null || component.getPrevious() == null;
                if (!inlines.isEmpty()) {
+                       if (!isOpen) {
+                               // Remove variable length pipe from options
+                               ListIterator<Item> it = inlines.listIterator();
+                               while (it.hasNext()) {
+                                       Item item = it.next();
+                                       if (item.isVariable())
+                                               it.remove();
+                               }
+                       }
+                       
                        inlineViewer = createItemList(expandBar, inlines, "Inline");
                }
 
                // Only allow elbows and ends to be added to open ends of the pipelines
-               boolean isOpen = component.getNext() == null || component.getPrevious() == null;
                if (isOpen) {
                        if (!turns.isEmpty()) {
                                turnViewer = createItemList(expandBar, turns, "Elbow");