Fix error in assigment of component name for new components

gitlab #74

Change-Id: Ie7b4b9b7459763031176039de9b448f54f9f490f

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
index a1ac7f82834a5a36551e93bebd42b7aa8e9fa45c..31bdda9e370887c34e3c80959d8a56f275e6697f 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
@@ -378,9 +378,6 @@ public class ComponentUtils {
        public static PipelineComponent addComponent(P3DRootNode root, PipelineComponent component,  InsertInstruction inst) throws Exception {
                
                PipelineComponent newComponent = ComponentUtils.createComponent(root, inst.typeUri);
        public static PipelineComponent addComponent(P3DRootNode root, PipelineComponent component,  InsertInstruction inst) throws Exception {
                
                PipelineComponent newComponent = ComponentUtils.createComponent(root, inst.typeUri);

-               if (inst.name != null)
-                       newComponent.setName(inst.name);
-               

                PipeControlPoint newPcp = newComponent.getControlPoint();
                
                PipeControlPoint toPcp = component.getControlPoint();
                PipeControlPoint newPcp = newComponent.getControlPoint();
                
                PipeControlPoint toPcp = component.getControlPoint();


@@ -471,8 +468,12 @@ public class ComponentUtils {
                        }
                }
                
                        }
                }
                

-               String name = component.getPipeRun().getUniqueName(typeName);
-               newComponent.setName(name);
+               if (inst.name != null) {
+                       newComponent.setName(inst.name);
+               } else {
+                       String name = component.getPipeRun().getUniqueName(typeName);
+                       newComponent.setName(name);
+               }

 
                pipeRun.addChild(newComponent);
                if (newPcp.isSizeChange())
 
                pipeRun.addChild(newComponent);
                if (newPcp.isSizeChange())