X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Fdiagram%2Frenaming%2FComponentsRenamingModel.java;h=4df5d4ec0a54be0a1558491b19bb36c4827626eb;hb=d1a82fe1414c77b97bec886d6a3ae3c5d926c334;hp=23d2ffa83d723de2f76642d06d1fdbdb3d3ffb30;hpb=bb1507f2eaee879439d355bf6b052e16d0df1bff;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/renaming/ComponentsRenamingModel.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/renaming/ComponentsRenamingModel.java
index 23d2ffa83..4df5d4ec0 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/renaming/ComponentsRenamingModel.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagram/renaming/ComponentsRenamingModel.java
@@ -2,7 +2,9 @@ package org.simantics.modeling.ui.diagram.renaming;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -31,6 +33,7 @@ import org.simantics.structural.stubs.StructuralResource2;
  */
 public class ComponentsRenamingModel {
     public ArrayList<NameEntry> entries = new ArrayList<NameEntry>();
+    public Set<NameEntry> selectedEntries = new HashSet<>();
     public String oldNamePrefix;
     public String newNamePrefix;
     public boolean reset;
@@ -41,7 +44,7 @@ public class ComponentsRenamingModel {
     private Resource configuration;
     private ComponentNamingStrategy namingStrategy;
 
-    public void read(ReadGraph g, Resource composite) throws DatabaseException {
+    public ComponentsRenamingModel read(ReadGraph g, Resource composite) throws DatabaseException {
         this.session = g.getSession();
         this.compositeVariable = Variables.getVariable(g, composite);
         this.configuration = g.syncRequest(new Configuration(composite));
@@ -68,6 +71,11 @@ public class ComponentsRenamingModel {
             prefixValidator = displayValue.getPossiblePropertyValue(g, Variables.INPUT_VALIDATOR);
 
         this.namingStrategy = ComponentNamingUtil.findNamingStrategy(g, null, composite);
+
+        // By default, select all entries.
+        this.selectedEntries.addAll(entries);
+
+        return this;
     }
 
     public void computeNewNames() {
@@ -125,7 +133,7 @@ public class ComponentsRenamingModel {
         Layer0 L0 = Layer0.getInstance(g);
         Layer0X L0X = Layer0X.getInstance(g);
         for(NameEntry entry : entries)
-            if(!entry.oldName.equals(entry.newName))
+            if(!entry.oldName.equals(entry.newName) && selectedEntries.contains(entry))
                 g.claimLiteral(entry.resource, L0.HasName, entry.newName, Bindings.STRING);
         if(!oldNamePrefix.equals(newNamePrefix))
             compositeVariable.setPropertyValue(g, L0X.HasGeneratedNamePrefix, newNamePrefix, Bindings.STRING);