Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Fullbright2012-12-12 14:47:06 +0000
committerPaul Fullbright2013-01-29 21:22:12 +0000
commit5592a48d016ec526653761a92b48e120b773d532 (patch)
tree8194fe2f2b27125b4ac5db551eb394ed32950563 /jaxb/plugins/org.eclipse.jpt.jaxb.core
parentb9c00bf83f6d3346bd7bf77db3bfa23d7fdb5658 (diff)
downloadwebtools.dali-5592a48d016ec526653761a92b48e120b773d532.tar.gz
webtools.dali-5592a48d016ec526653761a92b48e120b773d532.tar.xz
webtools.dali-5592a48d016ec526653761a92b48e120b773d532.zip
small fix to default access type calculation
Diffstat (limited to 'jaxb/plugins/org.eclipse.jpt.jaxb.core')
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java
index 71b3ee2a78..f5d2f7c3c1 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java
@@ -297,7 +297,7 @@ public class GenericJavaClassMapping
/**
* Default access type is determined by the following, in order of precedence:
- * - @XmlAccessorType annotation on a mapped super class
+ * - @XmlAccessorType annotation on a mapped (or transient, apparently) super class
* - @XmlAccessorType annotation on the package
* - default access type of {@link PUBLIC_MEMBER}
*/
@@ -314,7 +314,15 @@ public class GenericJavaClassMapping
}
protected XmlAccessType getSuperclassAccessType() {
- return this.superclass == null ? null : this.superclass.getSpecifiedAccessType();
+ JaxbClassMapping superclass = this.superclass;
+ while (superclass != null) {
+ XmlAccessType accessType = superclass.getSpecifiedAccessType();
+ if (accessType != null) {
+ return accessType;
+ }
+ superclass = superclass.getSuperclass();
+ }
+ return null;
}
protected XmlAccessType getPackageAccessType() {
@@ -380,7 +388,7 @@ public class GenericJavaClassMapping
/**
* Default access order is determined by the following, in order of precedence:
- * - @XmlAccessorOrder annotation on a mapped super class
+ * - @XmlAccessorOrder annotation on a mapped (or transient, apparently) super class
* - @XmlAccessorOrder annotation on the package
* - default access order of {@link UNDEFINED}
*/

Back to the top