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=dc00915ff0fda09a98493a9c0b67f9c55b97342a;hpb=a7945695983a62d0e1d25a4a1400458f16bcfd70;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 dc00915f..2321c1f9 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -263,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);
@@ -441,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;
 		}