311248 - no need to call unset*Strategy() API since another strategy radio button is being selected and setting that strategy unsets the others.

9 files changed, 14 insertions, 18 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumnEnabledRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumnEnabledRelationshipReference.java
index 0c8cce10a6..eb4958034a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumnEnabledRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumnEnabledRelationshipReference.java
@@ -54,6 +54,8 @@ public interface JoinColumnEnabledRelationshipReference
 	 * whichever one is also configured (is specified) or the default strategy
 	 * will apply at that point.
 	 */
+	// TODO remove this API (bug 311945)- wanted to remove it when I fixed bug 311248.
+	// API users should just call set on another strategy, this will unset all other strategies
 	void unsetJoinColumnJoiningStrategy();
 	
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTableEnabledRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTableEnabledRelationshipReference.java
index 6ad4734517..65337304b6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTableEnabledRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTableEnabledRelationshipReference.java
@@ -55,6 +55,8 @@ public interface JoinTableEnabledRelationshipReference
 	 * whichever one is also configured (is specified) or the default strategy
 	 * will apply at that point.
 	 */
+	// TODO remove this API (bug 311945)- wanted to remove it when I fixed bug 311248.
+	// API users should just call set on another strategy, this will unset all other strategies
 	void unsetJoinTableJoiningStrategy();
 	
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OwnableRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OwnableRelationshipReference.java
index 62489a4662..c54bebe030 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OwnableRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OwnableRelationshipReference.java
@@ -54,6 +54,8 @@ public interface OwnableRelationshipReference
 	 * whichever one is also being used (is specified) or the default strategy
 	 * will apply at that point.
 	 */
+	// TODO remove this API (bug 311945)- wanted to remove it when I fixed bug 311248.
+	// API users should just call set on another strategy, this will unset all other strategies
 	void unsetMappedByJoiningStrategy();
 	
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumnEnabledRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumnEnabledRelationshipReference.java
index dc1b8c9f89..e25ab2d581 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumnEnabledRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumnEnabledRelationshipReference.java
@@ -56,6 +56,8 @@ public interface PrimaryKeyJoinColumnEnabledRelationshipReference
 	 * whichever one is also configured (is specified) or the default strategy
 	 * will apply at that point.
 	 */
+	// TODO remove this API (bug 311945)- wanted to remove it when I fixed bug 311248.
+	// API users should just call set on another strategy, this will unset all other strategies
 	void unsetPrimaryKeyJoinColumnJoiningStrategy();
 	
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinColumnJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinColumnJoiningStrategyPane.java
index 71911fb0fe..cc33b7ee30 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinColumnJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinColumnJoiningStrategyPane.java
@@ -142,9 +142,7 @@ public class JoinColumnJoiningStrategyPane
 				if (value == Boolean.TRUE) {
 					this.subject.setJoinColumnJoiningStrategy();
 				}
-				else {
-					this.subject.unsetJoinColumnJoiningStrategy();
-				}
+				//value == FALSE - selection of another radio button causes this strategy to get unset
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinTableJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinTableJoiningStrategyPane.java
index 85b9df6bc2..36a747da29 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinTableJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/JoinTableJoiningStrategyPane.java
@@ -102,9 +102,7 @@ public class JoinTableJoiningStrategyPane
 				if (value == Boolean.TRUE) {
 					this.subject.setJoinTableJoiningStrategy();
 				}
-				else {
-					this.subject.unsetJoinTableJoiningStrategy();
-				}
+				//value == FALSE - selection of another radio button causes this strategy to get unset
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/ManyToManyJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/ManyToManyJoiningStrategyPane.java
index fd9cc88a97..689663067f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/ManyToManyJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/ManyToManyJoiningStrategyPane.java
@@ -98,9 +98,7 @@ public class ManyToManyJoiningStrategyPane
 				if (value == Boolean.TRUE) {
 					this.subject.setMappedByJoiningStrategy();
 				}
-				else {
-					this.subject.unsetMappedByJoiningStrategy();
-				}
+				//value == FALSE - selection of another radio button causes this strategy to get unset
 			}
 		};
 	}
@@ -119,9 +117,7 @@ public class ManyToManyJoiningStrategyPane
 				if (value == Boolean.TRUE) {
 					this.subject.setJoinTableJoiningStrategy();
 				}
-				else {
-					this.subject.unsetJoinTableJoiningStrategy();
-				}
+				//value == FALSE - selection of another radio button causes this strategy to get unset
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByJoiningStrategyPane.java
index a8802f1416..2a83f2ede5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/MappedByJoiningStrategyPane.java
@@ -87,9 +87,7 @@ public class MappedByJoiningStrategyPane
 				if (value == Boolean.TRUE) {
 					this.subject.setMappedByJoiningStrategy();
 				}
-				else {
-					this.subject.unsetMappedByJoiningStrategy();
-				}
+				//value == FALSE - selection of another radio button causes this strategy to get unset
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java
index d2713a56e9..99452f20fd 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java
@@ -79,9 +79,7 @@ public class PrimaryKeyJoinColumnJoiningStrategyPane
 				if (value == Boolean.TRUE) {
 					this.subject.setPrimaryKeyJoinColumnJoiningStrategy();
 				}
-				else {
-					this.subject.unsetPrimaryKeyJoinColumnJoiningStrategy();
-				}
+				//value == FALSE - selection of another radio button causes this strategy to get unset
 			}
 		};
 	}