X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fdialog%2FComponentSelectionDialog.java;h=2321c1f9941fbd89f2251c6b64b9f89a2ec8efea;hb=76b38316ec8297cbfec6a6759b095aef8cd65931;hp=2911be3619b32b2a6b86720123b3b2ba58ff60fb;hpb=77bd57393f474a10166872fe90a7b92f2446e9b5;p=simantics%2F3d.git

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 2911be36..2321c1f9 100644
--- 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");
@@ -252,6 +263,12 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(2, 1).applyTo(expandBar);
 		GridDataFactory.fillDefaults().grab(true, true).minSize(500, 500).hint(500, 500).applyTo(composite);
 
+		// If there is only one item in the ExpandBar, expand it by default to avoid unnecessary clicks
+		ExpandItem[] expandBarItems = expandBar.getItems();
+		if (expandBarItems.length == 1) {
+			expandBarItems[0].setExpanded(true);
+		}
+
 		Label label = new Label(composite, SWT.NONE);
 		label.setText("Position");
 		Composite buttonComposite = new Composite(composite, SWT.NONE);
@@ -430,8 +447,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		GridDataFactory.fillDefaults().span(2, 1).align(SWT.END, SWT.END).grab(true, false).applyTo(validationLabel);
 
 		if (!allowed.contains(PositionType.NEXT) && !allowed.contains(PositionType.PREVIOUS)) {
-			turnViewer.getList().setEnabled(false);
-			endViewer.getList().setEnabled(false);
+			if (turnViewer != null)
+				turnViewer.getList().setEnabled(false);
+			if (endViewer != null)
+				endViewer.getList().setEnabled(false);
 			inlineSplit = true;
 		}