Merge "Allow insertion of reducers in the middle of pipe runs" into release/1.35.2

[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 00b52f3bb1073b0e12e1cb43dd64b5b18f47b97d..0c292bc8ff8a5ec2c0173e8a40f63fce4c954eea 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -472,25 +472,16 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                        }
                
                        if (selected.isSizeChange()) {
-                               filterAllowed.add(PositionType.NEXT);
-                               filterAllowed.add(PositionType.PREVIOUS);
-                               if (inlineSplit) {
-                                       turnRadiusText.setEnabled(false);
-                                       diameterText.setEnabled(false);
+                               turnRadiusText.setEnabled(true);
+                               diameterText.setEnabled(true);
+                               if (diameter == null || turnRadius == null)
                                        ok = false;
-                               } else {
-                                       turnRadiusText.setEnabled(true);
-                                       diameterText.setEnabled(true);
-                                       if (diameter == null || turnRadius == null)
-                                               ok = false;
-                               }
-                               
                        } else {
                                turnRadiusText.setEnabled(false);
                                diameterText.setEnabled(false);
                        }
                        
-                       if (!selected.isSizeChange() && !selected.isVariable()) {
+                       if (!selected.isVariable()) {
                                switch (selected.getType()) {
                                        case END:
                                                filterAllowed.add(PositionType.NEXT);