changed the display string for attribute overrides and association overrides, ideally I think an icon might be appropriate

2 files changed, 4 insertions, 16 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_mappings.properties b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_mappings.properties
index c2ab47192a..9a6a8252ba 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_mappings.properties
+++ b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_mappings.properties
@@ -146,8 +146,8 @@ PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsSecDefault={0} -> Default
 AttributeOverridesComposite_attributeOverrides=Attribute Overrides
 AttributeOverridesComposite_overrideDefault=Override Default
 
-OverridesComposite_association=Override Association
-OverridesComposite_attribute=Override Attribute
+OverridesComposite_association=Association Override
+OverridesComposite_attribute=Attribute Override
 OverridesComposite_noName=<Name not set>
 OverridesComposite_joinColumn=Join Columns
 
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java
index 42850a5dd2..fbd6253cc6 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java
@@ -31,7 +31,6 @@ import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.ui.internal.widgets.PostExecution;
 import org.eclipse.jpt.ui.internal.widgets.WidgetFactory;
 import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter;
-import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.StringTools;
 import org.eclipse.jpt.utility.internal.Transformer;
 import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel;
@@ -237,18 +236,13 @@ public class OverridesComposite extends AbstractFormPane<Entity>
 	}
 
 	private String buildOverrideDisplayString(BaseOverride override) {
-
-		Entity subject = subject();
 		String overrideType;
-		int index = 0;
 
-		// Retrieve the index and type
+		// Retrieve the type
 		if (override instanceof AssociationOverride) {
-			index = CollectionTools.indexOf(subject.associationOverrides(), override);
 			overrideType = JptUiMappingsMessages.OverridesComposite_association;
 		}
 		else {
-			index = CollectionTools.indexOf(subject.attributeOverrides(), override);
 			overrideType = JptUiMappingsMessages.OverridesComposite_attribute;
 		}
 
@@ -258,18 +252,12 @@ public class OverridesComposite extends AbstractFormPane<Entity>
 		if (StringTools.stringIsEmpty(name)) {
 			name = JptUiMappingsMessages.OverridesComposite_noName;
 		}
-		else {
-			name = name.trim();
-		}
 
-		// Format: <name> (Association <index>), we show the index since
-		// it's possible to have one than one override with the same name
+		// Format: <name> (Attribute/Association Override)
 		StringBuilder sb = new StringBuilder();
 		sb.append(name);
 		sb.append(" (");
 		sb.append(overrideType);
-		sb.append(" ");
-		sb.append(index + 1);
 		sb.append(") ");
 		return sb.toString();
 	}