Fix renaming of elements with dimensions. Fixes #262.

osate · Dec 13, 2017 · de70f00 · de70f00
1 parent d8f5e39
commit de70f00
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/org.osate.ge/src/org/osate/ge/internal/businessObjectHandlers/FeatureHandler.java b/org.osate.ge/src/org/osate/ge/internal/businessObjectHandlers/FeatureHandler.java
@@ -45,6 +45,7 @@
 import org.osate.ge.di.Create;
 import org.osate.ge.di.GetGraphicalConfiguration;
 import org.osate.ge.di.GetName;
+import org.osate.ge.di.GetNameForEditing;
 import org.osate.ge.di.GetPaletteEntries;
 import org.osate.ge.di.IsApplicable;
 import org.osate.ge.di.Names;
@@ -245,6 +246,11 @@ public String getName(final @Named(Names.BUSINESS_OBJECT) NamedElement feature)
 		return name;
 	}
 
+	@GetNameForEditing
+	public String getNameForEditing(final @Named(Names.BUSINESS_OBJECT) NamedElement feature) {
+		return feature.getName();
+	}
+
 	@ValidateName
 	public String validateName(final @Named(Names.BUSINESS_OBJECT) NamedElement feature,
 			final @Named(Names.NAME) String value, final NamingService namingService) {

diff --git a/org.osate.ge/src/org/osate/ge/internal/businessObjectHandlers/SubcomponentHandler.java b/org.osate.ge/src/org/osate/ge/internal/businessObjectHandlers/SubcomponentHandler.java
@@ -22,6 +22,7 @@
 import org.osate.ge.di.Create;
 import org.osate.ge.di.GetGraphicalConfiguration;
 import org.osate.ge.di.GetName;
+import org.osate.ge.di.GetNameForEditing;
 import org.osate.ge.di.GetPaletteEntries;
 import org.osate.ge.di.IsApplicable;
 import org.osate.ge.di.Names;
@@ -86,6 +87,11 @@ public String getName(final @Named(Names.BUSINESS_OBJECT) Subcomponent sc) {
 		return getSubcomponentName(sc) + AadlArrayUtil.getDimensionUserString(sc);
 	}
 
+	@GetNameForEditing
+	public String getNameForEditing(final @Named(Names.BUSINESS_OBJECT) Subcomponent sc) {
+		return getSubcomponentName(sc);
+	}
+
 	private String getSubcomponentName(final Subcomponent sc) {
 		return sc.getName() == null ? "" : sc.getName();
 	}