add SpecifiedOrmPersistentType.getDefaultDefaultAccess()

1 files changed, 10 insertions, 12 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
index fc5021d0eb..5119619372 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
@@ -231,25 +231,23 @@ public abstract class SpecifiedOrmPersistentType
 
 	protected AccessType buildDefaultAccess() {
 		if ( ! this.mapping.isMetadataComplete()) {
-			if (this.getJavaPersistentType() != null) {
-				if (this.javaPersistentTypeHasSpecifiedAccess()) {
-					return this.getJavaPersistentType().getAccess();
+			JavaPersistentType jpt = this.getJavaPersistentType();
+			if (jpt != null) {
+				if (((jpt.getSpecifiedAccess() != null) || jpt.hasAnyAnnotatedAttributes())) {
+					return jpt.getAccess();
 				}
 			}
-			if (getSuperPersistentType() != null) {
-				return getSuperPersistentType().getAccess();
+			PersistentType superPT = this.getSuperPersistentType();
+			if (superPT != null) {
+				return superPT.getAccess();
 			}
 		}
 		AccessType access = this.getMappingFileRoot().getAccess();
-		return (access != null) ? access : AccessType.FIELD;  // default to FIELD if no specified access found
+		return (access != null) ? access : this.getDefaultDefaultAccess();
 	}
 
-	/**
-	 * pre-condition: {@link #getJavaPersistentType()} is not <code>null</code>
-	 */
-	protected boolean javaPersistentTypeHasSpecifiedAccess() {
-		return (this.getJavaPersistentType().getSpecifiedAccess() != null) ||
-				this.getJavaPersistentType().hasAnyAnnotatedAttributes();
+	protected AccessType getDefaultDefaultAccess() {
+		return AccessType.FIELD; // default to FIELD if no specified access found
 	}