diff options
author | Karen Butzke | 2012-09-26 11:17:22 +0000 |
---|---|---|
committer | Karen Butzke | 2012-09-26 12:42:41 +0000 |
commit | c8626e0adc26f2ad38a485cef71a39ef8e57ac4b (patch) | |
tree | f4ea757804db7394556c7169f1d0d50dfea8843a | |
parent | c1276439d6c72fe843514421fb497f603a34eb6b (diff) | |
download | webtools.dali-c8626e0adc26f2ad38a485cef71a39ef8e57ac4b.tar.gz webtools.dali-c8626e0adc26f2ad38a485cef71a39ef8e57ac4b.tar.xz webtools.dali-c8626e0adc26f2ad38a485cef71a39ef8e57ac4b.zip |
minor change to Nan's patch, building a null Owner implementation instead of checking for null.
2 files changed, 35 insertions, 6 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java index 5bab411eae..bc684da49d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java @@ -61,7 +61,7 @@ public class GenericJavaOrderable * JPA 1.0 */ public GenericJavaOrderable(JavaAttributeMapping parent) { - this(parent, null); + this(parent, buildNullOwner()); } /** @@ -79,6 +79,20 @@ public class GenericJavaOrderable this.orderColumn = this.buildOrderColumn(); } + /** + * null Owner implementation for JPA 1.0 where there is no OrderColumn + */ + static Owner buildNullOwner() { + return new Owner() { + public Table resolveDbTable(String tableName) { + return null; + } + public String getTableName() { + return null; + } + }; + } + // ********** synchronize/update ********** @@ -388,12 +402,12 @@ public class GenericJavaOrderable // JPA 2.0 only public String getDefaultTableName() { - return this.owner == null ? null : this.owner.getTableName(); + return this.owner.getTableName(); } // JPA 2.0 only protected Table resolveDbTable(String tableName) { - return this.owner == null ? null : this.owner.resolveDbTable(tableName); + return this.owner.resolveDbTable(tableName); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java index 968ecb667e..79cc2ccb97 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java @@ -58,7 +58,7 @@ public class GenericOrmOrderable * JPA 1.0 */ public GenericOrmOrderable(OrmAttributeMapping parent) { - this(parent, null); + this(parent, buildNullOwner()); } /** @@ -78,6 +78,21 @@ public class GenericOrmOrderable } + /** + * null Owner implementation for JPA 1.0 where there is no OrderColumn + */ + static Owner buildNullOwner() { + return new Owner() { + public Table resolveDbTable(String tableName) { + return null; + } + public String getTableName() { + return null; + } + }; + } + + // ********** synchronize/update ********** @Override @@ -373,12 +388,12 @@ public class GenericOrmOrderable // JPA 2.0 public String getDefaultTableName() { - return this.owner == null ? null : this.owner.getTableName(); + return this.owner.getTableName(); } // JPA 2.0 protected Table resolveDbTable(String tableName) { - return this.owner == null ? null : this.owner.resolveDbTable(tableName); + return this.owner.resolveDbTable(tableName); } |