cleaned up join fetch variables
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingImpl.java
index 9487f92..16581ea 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMappingImpl.java
@@ -20,34 +20,34 @@
public class EclipseLinkJavaManyToManyMappingImpl extends GenericJavaManyToManyMapping implements EclipseLinkRelationshipMapping
{
+ protected final EclipseLinkJavaJoinFetch joinFetch;
- protected final EclipseLinkJavaJoinFetch joinFetchable;
-
+
public EclipseLinkJavaManyToManyMappingImpl(JavaPersistentAttribute parent) {
super(parent);
- this.joinFetchable = new EclipseLinkJavaJoinFetch(this);
+ this.joinFetch = new EclipseLinkJavaJoinFetch(this);
}
-
+
+
public JoinFetch getJoinFetch() {
- return this.joinFetchable;
+ return this.joinFetch;
}
@Override
public void initialize(JavaResourcePersistentAttribute jrpa) {
super.initialize(jrpa);
- this.joinFetchable.initialize(jrpa);
+ this.joinFetch.initialize(jrpa);
}
@Override
public void update(JavaResourcePersistentAttribute jrpa) {
super.update(jrpa);
- this.joinFetchable.update(jrpa);
+ this.joinFetch.update(jrpa);
}
@Override
public void validate(List<IMessage> messages, CompilationUnit astRoot) {
super.validate(messages, astRoot);
- this.joinFetchable.validate(messages, astRoot);
+ this.joinFetch.validate(messages, astRoot);
}
-
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingImpl.java
index cb47d51..3eff7dc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMappingImpl.java
@@ -20,35 +20,34 @@
public class EclipseLinkJavaManyToOneMappingImpl extends GenericJavaManyToOneMapping implements EclipseLinkRelationshipMapping
{
+ protected final EclipseLinkJavaJoinFetch joinFetch;
- protected final EclipseLinkJavaJoinFetch joinFetchable;
-
+
public EclipseLinkJavaManyToOneMappingImpl(JavaPersistentAttribute parent) {
super(parent);
- this.joinFetchable = new EclipseLinkJavaJoinFetch(this);
+ this.joinFetch = new EclipseLinkJavaJoinFetch(this);
}
+
public JoinFetch getJoinFetch() {
- return this.joinFetchable;
+ return this.joinFetch;
}
@Override
public void initialize(JavaResourcePersistentAttribute jrpa) {
super.initialize(jrpa);
- this.joinFetchable.initialize(jrpa);
+ this.joinFetch.initialize(jrpa);
}
@Override
public void update(JavaResourcePersistentAttribute jrpa) {
super.update(jrpa);
- this.joinFetchable.update(jrpa);
+ this.joinFetch.update(jrpa);
}
-
@Override
public void validate(List<IMessage> messages, CompilationUnit astRoot) {
super.validate(messages, astRoot);
- this.joinFetchable.validate(messages, astRoot);
+ this.joinFetch.validate(messages, astRoot);
}
-
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingImpl.java
index 408e29b..f808901 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingImpl.java
@@ -22,16 +22,18 @@
public class EclipseLinkJavaOneToManyMappingImpl extends GenericJavaOneToManyMapping implements EclipseLinkOneToManyMapping
{
+ protected final EclipseLinkJavaJoinFetch joinFetch;
- protected final EclipseLinkJavaJoinFetch joinFetchable;
protected final EclipseLinkJavaPrivateOwned privateOwned;
+
public EclipseLinkJavaOneToManyMappingImpl(JavaPersistentAttribute parent) {
super(parent);
- this.joinFetchable = new EclipseLinkJavaJoinFetch(this);
+ this.joinFetch = new EclipseLinkJavaJoinFetch(this);
this.privateOwned = new EclipseLinkJavaPrivateOwned(this);
}
+
protected String getPrivateOwnedAnnotationName() {
return PrivateOwnedAnnotation.ANNOTATION_NAME;
}
@@ -49,7 +51,7 @@
}
public JoinFetch getJoinFetch() {
- return this.joinFetchable;
+ return this.joinFetch;
}
public PrivateOwned getPrivateOwned() {
@@ -59,21 +61,21 @@
@Override
public void initialize(JavaResourcePersistentAttribute jrpa) {
super.initialize(jrpa);
- this.joinFetchable.initialize(jrpa);
+ this.joinFetch.initialize(jrpa);
this.privateOwned.initialize(jrpa);
}
@Override
public void update(JavaResourcePersistentAttribute jrpa) {
super.update(jrpa);
- this.joinFetchable.update(jrpa);
+ this.joinFetch.update(jrpa);
this.privateOwned.update(jrpa);
}
@Override
public void validate(List<IMessage> messages, CompilationUnit astRoot) {
super.validate(messages, astRoot);
- this.joinFetchable.validate(messages, astRoot);
+ this.joinFetch.validate(messages, astRoot);
this.privateOwned.validate(messages, astRoot);
}
}
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingImpl.java
index 1178a9d..214d922 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingImpl.java
@@ -21,18 +21,20 @@
public class EclipseLinkJavaOneToOneMappingImpl extends GenericJavaOneToOneMapping implements EclipseLinkOneToOneMapping
{
+ protected final EclipseLinkJavaJoinFetch joinFetch;
- protected final EclipseLinkJavaJoinFetch joinFetchable;
protected final EclipseLinkJavaPrivateOwned privateOwned;
-
+
+
public EclipseLinkJavaOneToOneMappingImpl(JavaPersistentAttribute parent) {
super(parent);
- this.joinFetchable = new EclipseLinkJavaJoinFetch(this);
+ this.joinFetch = new EclipseLinkJavaJoinFetch(this);
this.privateOwned = new EclipseLinkJavaPrivateOwned(this);
}
+
public JoinFetch getJoinFetch() {
- return this.joinFetchable;
+ return this.joinFetch;
}
public PrivateOwned getPrivateOwned() {
@@ -42,22 +44,21 @@
@Override
public void initialize(JavaResourcePersistentAttribute jrpa) {
super.initialize(jrpa);
- this.joinFetchable.initialize(jrpa);
+ this.joinFetch.initialize(jrpa);
this.privateOwned.initialize(jrpa);
}
@Override
public void update(JavaResourcePersistentAttribute jrpa) {
super.update(jrpa);
- this.joinFetchable.update(jrpa);
+ this.joinFetch.update(jrpa);
this.privateOwned.update(jrpa);
}
@Override
public void validate(List<IMessage> messages, CompilationUnit astRoot) {
super.validate(messages, astRoot);
- this.joinFetchable.validate(messages, astRoot);
+ this.joinFetch.validate(messages, astRoot);
this.privateOwned.validate(messages, astRoot);
}
-
}
