[339298] Fix ElementCollection Map attribute overrides. Patch from Nan.

2 files changed, 6 insertions, 13 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java
index 90a62ee8ba..63c480bb7a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java
@@ -76,7 +76,7 @@ public interface JavaOverrideContainer
 		 * that may be prepended to the override name.
 		 * Return <code>null</code> if no prefix is supported.
 		 * <p>
-		 * JPA 2.0 supports the prefixes <code>"map"</code> and <code>"key"</code>.
+		 * JPA 2.0 supports the prefixes <code>"value"</code> and <code>"key"</code>.
 		 */
 		String getPossiblePrefix();
 
@@ -89,7 +89,7 @@ public interface JavaOverrideContainer
 		 * value. Return whether the specified override name, which may have a
 		 * prefix, is relevant to the override container.
 		 * <p>
-		 * JPA 2.0 supports the prefixes <code>"map"</code> and <code>"key"</code>.
+		 * JPA 2.0 supports the prefixes <code>"value"</code> and <code>"key"</code>.
 		 */
 		boolean isRelevant(String overrideName);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
index 860b447bac..5c56ffc8f0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
@@ -85,7 +85,6 @@ public abstract class AbstractJavaOverrideContainer<
 	protected AbstractJavaOverrideContainer(JavaJpaContextNode parent, O owner) {
 		super(parent);
 		this.owner = owner;
-		this.initializeSpecifiedOverrides();
 	}
 
 
@@ -94,14 +93,14 @@ public abstract class AbstractJavaOverrideContainer<
 	@Override
 	public void synchronizeWithResourceModel() {
 		super.synchronizeWithResourceModel();
-		this.syncSpecifiedOverrides();
+		this.synchronizeNodesWithResourceModel(this.getSpecifiedOverrides());
 		// the virtual overrides do not need a sync
 	}
 
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedOverrides());
+		this.updateSpecifiedOverrides();
 		this.updateVirtualOverrides();
 	}
 
@@ -306,16 +305,10 @@ public abstract class AbstractJavaOverrideContainer<
 		this.getResourcePersistentMember().moveAnnotation(targetAnnotationIndex, sourceAnnotationIndex, this.getOverrideContainerAnnotationName());
 	}
 
-	protected void initializeSpecifiedOverrides() {
-		for (A annotation : this.getRelevantOverrideAnnotations()) {
-			this.specifiedOverrides.add(this.buildSpecifiedOverride(annotation));
-		}
-	}
-
 	protected abstract S buildSpecifiedOverride(A overrideAnnotation);
 
-	protected void syncSpecifiedOverrides() {
-		ContextContainerTools.synchronizeWithResourceModel(this.specifiedOverrideContainerAdapter);
+	protected void updateSpecifiedOverrides() {
+		ContextContainerTools.update(this.specifiedOverrideContainerAdapter);
 	}
 
 	protected Iterable<A> getRelevantOverrideAnnotations() {