255992 - problems setting mappedBy/fetch/targetEntity on default 1-m and 1-1

3 files changed, 52 insertions, 19 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java
index e7a21e46f8..ec6d67722f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java
@@ -43,6 +43,12 @@ public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade
 		this.relationshipMapping.setCascadeAll(newAll);
 		firePropertyChanged(Cascade.ALL_PROPERTY, oldAll, newAll);
 	}
+	
+	protected void setAll_(boolean newAll) {
+		boolean oldAll = this.all;
+		this.all = newAll;
+		firePropertyChanged(Cascade.ALL_PROPERTY, oldAll, newAll);
+	}
 
 	public boolean isPersist() {
 		return this.persist;
@@ -55,6 +61,12 @@ public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade
 		firePropertyChanged(Cascade.PERSIST_PROPERTY, oldPersist, newPersist);
 	}
 
+	protected void setPersist_(boolean newPersist) {
+		boolean oldPersist = this.persist;
+		this.persist = newPersist;
+		firePropertyChanged(Cascade.PERSIST_PROPERTY, oldPersist, newPersist);
+	}
+
 	public boolean isMerge() {
 		return this.merge;
 	}
@@ -66,6 +78,12 @@ public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade
 		firePropertyChanged(Cascade.MERGE_PROPERTY, oldMerge, newMerge);
 	}
 
+	protected void setMerge_(boolean newMerge) {
+		boolean oldMerge = this.merge;
+		this.merge = newMerge;
+		firePropertyChanged(Cascade.MERGE_PROPERTY, oldMerge, newMerge);
+	}
+
 	public boolean isRemove() {
 		return this.remove;
 	}
@@ -77,6 +95,12 @@ public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade
 		firePropertyChanged(Cascade.REMOVE_PROPERTY, oldRemove, newRemove);
 	}
 
+	protected void setRemove_(boolean newRemove) {
+		boolean oldRemove = this.remove;
+		this.remove = newRemove;
+		firePropertyChanged(Cascade.REMOVE_PROPERTY, oldRemove, newRemove);
+	}
+
 	public boolean isRefresh() {
 		return this.refresh;
 	}
@@ -88,6 +112,12 @@ public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade
 		firePropertyChanged(Cascade.REFRESH_PROPERTY, oldRefresh, newRefresh);
 	}
 
+	protected void setRefresh_(boolean newRefresh) {
+		boolean oldRefresh = this.refresh;
+		this.refresh = newRefresh;
+		firePropertyChanged(Cascade.REFRESH_PROPERTY, oldRefresh, newRefresh);
+	}
+
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
 		return this.relationshipMapping.getCascadeTextRange(astRoot);
 	}
@@ -103,10 +133,10 @@ public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade
 	
 	public void update(RelationshipMappingAnnotation relationshipMapping) {
 		this.relationshipMapping = relationshipMapping;
-		this.setAll(relationshipMapping.isCascadeAll());
-		this.setPersist(relationshipMapping.isCascadePersist());
-		this.setMerge(relationshipMapping.isCascadeMerge());
-		this.setRemove(relationshipMapping.isCascadeRemove());
-		this.setRefresh(relationshipMapping.isCascadeRefresh());
+		this.setAll_(relationshipMapping.isCascadeAll());
+		this.setPersist_(relationshipMapping.isCascadePersist());
+		this.setMerge_(relationshipMapping.isCascadeMerge());
+		this.setRemove_(relationshipMapping.isCascadeRemove());
+		this.setRefresh_(relationshipMapping.isCascadeRefresh());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToMany.java
index 08a9bb98ed..fed1896426 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToMany.java
@@ -14,7 +14,6 @@ import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.FetchType;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.OneToManyAnnotation;
-import org.eclipse.jpt.core.resource.java.OneToOneAnnotation;
 import org.eclipse.jpt.core.utility.TextRange;
 
 
@@ -41,7 +40,7 @@ public class NullOneToMany extends AbstractJavaResourceNode implements OneToMany
 	}
 
 	public String getAnnotationName() {
-		return OneToOneAnnotation.ANNOTATION_NAME;
+		return OneToManyAnnotation.ANNOTATION_NAME;
 	}
 	
 	@Override
@@ -69,7 +68,9 @@ public class NullOneToMany extends AbstractJavaResourceNode implements OneToMany
 	}
 
 	public void setMappedBy(String mappedBy) {
-		
+		if (mappedBy != null) {
+			createOneToManyResource().setMappedBy(mappedBy);
+		}				
 	}
 
 	public String getFullyQualifiedTargetEntity() {
@@ -91,7 +92,7 @@ public class NullOneToMany extends AbstractJavaResourceNode implements OneToMany
 	}
 
 	public void setCascadeAll(boolean all) {
-		
+		createOneToManyResource().setCascadeAll(all);
 	}
 
 	public boolean isCascadeMerge() {
@@ -99,7 +100,7 @@ public class NullOneToMany extends AbstractJavaResourceNode implements OneToMany
 	}
 
 	public void setCascadeMerge(boolean merge) {
-		
+		createOneToManyResource().setCascadeMerge(merge);
 	}
 
 	public boolean isCascadePersist() {
@@ -107,7 +108,7 @@ public class NullOneToMany extends AbstractJavaResourceNode implements OneToMany
 	}
 
 	public void setCascadePersist(boolean persist) {
-		
+		createOneToManyResource().setCascadePersist(persist);
 	}
 
 	public boolean isCascadeRefresh() {
@@ -115,7 +116,7 @@ public class NullOneToMany extends AbstractJavaResourceNode implements OneToMany
 	}
 
 	public void setCascadeRefresh(boolean refresh) {
-		
+		createOneToManyResource().setCascadeRefresh(refresh);
 	}
 
 	public boolean isCascadeRemove() {
@@ -123,7 +124,7 @@ public class NullOneToMany extends AbstractJavaResourceNode implements OneToMany
 	}
 
 	public void setCascadeRemove(boolean remove) {
-		
+		createOneToManyResource().setCascadeRemove(remove);
 	}
 
 	public void update(CompilationUnit astRoot) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToOne.java
index d4648a2a92..7219282afb 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullOneToOne.java
@@ -78,7 +78,9 @@ public class NullOneToOne extends AbstractJavaResourceNode implements OneToOneAn
 	}
 
 	public void setMappedBy(String mappedBy) {
-		
+		if (mappedBy != null) {
+			createOneToOneResource().setMappedBy(mappedBy);
+		}
 	}
 
 	public String getFullyQualifiedTargetEntity() {
@@ -100,7 +102,7 @@ public class NullOneToOne extends AbstractJavaResourceNode implements OneToOneAn
 	}
 
 	public void setCascadeAll(boolean all) {
-		
+		createOneToOneResource().setCascadeAll(all);
 	}
 
 	public boolean isCascadeMerge() {
@@ -108,7 +110,7 @@ public class NullOneToOne extends AbstractJavaResourceNode implements OneToOneAn
 	}
 
 	public void setCascadeMerge(boolean merge) {
-		
+		createOneToOneResource().setCascadeMerge(merge);
 	}
 
 	public boolean isCascadePersist() {
@@ -116,7 +118,7 @@ public class NullOneToOne extends AbstractJavaResourceNode implements OneToOneAn
 	}
 
 	public void setCascadePersist(boolean persist) {
-		
+		createOneToOneResource().setCascadePersist(persist);
 	}
 
 	public boolean isCascadeRefresh() {
@@ -124,7 +126,7 @@ public class NullOneToOne extends AbstractJavaResourceNode implements OneToOneAn
 	}
 
 	public void setCascadeRefresh(boolean refresh) {
-		
+		createOneToOneResource().setCascadeRefresh(refresh);
 	}
 
 	public boolean isCascadeRemove() {
@@ -132,7 +134,7 @@ public class NullOneToOne extends AbstractJavaResourceNode implements OneToOneAn
 	}
 
 	public void setCascadeRemove(boolean remove) {
-		
+		createOneToOneResource().setCascadeRemove(remove);
 	}
 
 	public void update(CompilationUnit astRoot) {