From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 3 Jun 2020 17:24:53 +0000 (+0000)
Subject: Merge "Removed 3D modelling preferences page description which is equals title"
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=bcfc6759827c4d2d8c360b81dc9fa88e0e807595;hp=4f0dcf4de54b3d91b86324e2e93e31ffd2fcd8e6;p=simantics%2F3d.git

Merge "Removed 3D modelling preferences page description which is equals title"
---

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
index dae8c629..b82a097c 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
@@ -206,12 +206,23 @@ public class AddComponentAction extends vtkSwtAction {
 			inst.insertPosition = insertPosition;
 			inst.rotationAngle = rotationAngle;
 			inst.position = position;
-			ComponentUtils.addComponent(root, component, inst);
+			PipelineComponent newComponent = ComponentUtils.addComponent(root, component, inst);
+			componentAdded(newComponent);
 		} catch (Exception e) {
 			ExceptionUtils.logAndShowError("Cannot add component", e);
 		}
 	}
 	
+	/**
+	 * This method does nothing, but can be overridden by a subclass to do additional
+	 * post-processing for a newly added component.
+	 * 
+	 * @param newComponent  A newly added pipeline component
+	 */
+	protected void componentAdded(PipelineComponent newComponent) {
+		// Nothing to do here
+	}
+
 	public boolean mouseClicked(MouseEvent e) {
 		if (e.getClickCount() == 1 && e.getButton() == MouseEvent.BUTTON1) {
 			int type = panel.getPickType();
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 cfd8c861..2321c1f9 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -447,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;
 		}