Expand by default when only one group exists in the Add Component dialog

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / dialog / ComponentSelectionDialog.java

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 207f929e9cc24c55ab316b3b15faf3124148abf1..cfd8c861dbc7d578f9f7e7ee39eaad13a9014e63 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");
@@ -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);
@@ -645,6 +662,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                        } else {
                                turnRadiusText.setEnabled(false);
                                diameterText.setEnabled(false);
+                               thicknessText.setEnabled(false);
                        }
 
                        if (!selected.isVariable()) {