predominant joining strategy updates on resource model API changes

2 files changed, 12 insertions, 8 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyRelationshipReference.java
index 5cc467d12b..ec96386b86 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyRelationshipReference.java
@@ -76,8 +76,8 @@ public class JavaEclipseLinkOneToManyRelationshipReference
 	// **************** mapped by **********************************************
 	
 	@Override
-	public void setMappedByJoiningStrategy() {
-		super.setMappedByJoiningStrategy();
+	protected void setMappedByJoiningStrategy_() {
+		super.setMappedByJoiningStrategy_();
 		this.joinColumnJoiningStrategy.removeStrategy();
 	}
 	
@@ -91,8 +91,8 @@ public class JavaEclipseLinkOneToManyRelationshipReference
 	// **************** join table *********************************************
 	
 	@Override
-	public void setJoinTableJoiningStrategy() {
-		super.setJoinTableJoiningStrategy();
+	protected void setJoinTableJoiningStrategy_() {
+		super.setJoinTableJoiningStrategy_();
 		this.joinColumnJoiningStrategy.removeStrategy();
 	}
 	
@@ -117,10 +117,12 @@ public class JavaEclipseLinkOneToManyRelationshipReference
 		this.joinColumnJoiningStrategy.addStrategy();
 		this.mappedByJoiningStrategy.removeStrategy();
 		this.joinTableJoiningStrategy.removeStrategy();
+		setPredominantJoiningStrategy();
 	}
 	
 	public void unsetJoinColumnJoiningStrategy() {
 		this.joinColumnJoiningStrategy.removeStrategy();
+		setPredominantJoiningStrategy();
 	}
 	
 	public boolean mayHaveDefaultJoinColumn() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyRelationshipReference.java
index dbc2f8522d..37b287c91f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyRelationshipReference.java
@@ -92,8 +92,8 @@ public class OrmEclipseLinkOneToManyRelationshipReference
 	// **************** mapped by **********************************************
 	
 	@Override
-	public void setMappedByJoiningStrategy() {
-		super.setMappedByJoiningStrategy();
+	protected void setMappedByJoiningStrategy_() {
+		super.setMappedByJoiningStrategy_();
 		this.joinColumnJoiningStrategy.removeStrategy();
 	}
 	
@@ -107,8 +107,8 @@ public class OrmEclipseLinkOneToManyRelationshipReference
 	// **************** join table *********************************************
 	
 	@Override
-	public void setJoinTableJoiningStrategy() {
-		super.setJoinTableJoiningStrategy();
+	protected void setJoinTableJoiningStrategy_() {
+		super.setJoinTableJoiningStrategy_();
 		this.joinColumnJoiningStrategy.removeStrategy();
 	}
 	
@@ -133,10 +133,12 @@ public class OrmEclipseLinkOneToManyRelationshipReference
 		this.joinColumnJoiningStrategy.addStrategy();
 		this.mappedByJoiningStrategy.removeStrategy();
 		this.joinTableJoiningStrategy.removeStrategy();
+		setPredominantJoiningStrategy();
 	}
 	
 	public void unsetJoinColumnJoiningStrategy() {
 		this.joinColumnJoiningStrategy.removeStrategy();
+		setPredominantJoiningStrategy();
 	}
 	
 	public boolean mayHaveDefaultJoinColumn() {