refactored platform def inheritance

4 files changed, 175 insertions, 147 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/AbstractJaxb_2_1_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/AbstractJaxb_2_1_PlatformDefinition.java
new file mode 100644
index 0000000000..c8a445aa9a
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/AbstractJaxb_2_1_PlatformDefinition.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.core.internal.jaxb21;
+
+import java.util.ArrayList;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.common.core.JptCommonCorePlugin;
+import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.jaxb.core.JaxbResourceModelProvider;
+import org.eclipse.jpt.jaxb.core.context.java.DefaultJavaAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.internal.AbstractJaxbPlatformDefinition;
+import org.eclipse.jpt.jaxb.core.internal.JavaPackageInfoResourceModelProvider;
+import org.eclipse.jpt.jaxb.core.internal.JavaResourceModelProvider;
+import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAnyAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAnyElementMappingDefinition;
+import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAttributeMappingDefinition;
+import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlElementMappingDefinition;
+import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlTransientMappingDefinition;
+import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlValueMappingDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAccessorOrderAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAccessorTypeAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAnyAttributeAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAnyElementAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAttachmentRefAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAttributeAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementDeclAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementRefAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementWrapperAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementsAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlEnumAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlEnumValueAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlIDAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlIDREFAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlInlineBinaryDataAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlJavaTypeAdapterAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlListAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlMimeTypeAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlMixedAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlRegistryAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlRootElementAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSchemaAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSchemaTypeAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSeeAlsoAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlTransientAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlTypeAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlValueAnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.resource.java.AnnotationDefinition;
+import org.eclipse.jpt.jaxb.core.resource.java.NestableAnnotationDefinition;
+
+
+public abstract class AbstractJaxb_2_1_PlatformDefinition
+		extends AbstractJaxbPlatformDefinition {
+	
+	protected AbstractJaxb_2_1_PlatformDefinition() {
+		super();
+	}
+	
+	
+	@Override
+	protected AnnotationDefinition[] buildAnnotationDefinitions() {
+		return new AnnotationDefinition[] {
+				XmlAccessorOrderAnnotationDefinition.instance(),
+				XmlAccessorTypeAnnotationDefinition.instance(),
+				XmlAnyAttributeAnnotationDefinition.instance(),
+				XmlAnyElementAnnotationDefinition.instance(),
+				XmlAttachmentRefAnnotationDefinition.instance(),
+				XmlAttributeAnnotationDefinition.instance(),
+				XmlElementAnnotationDefinition.instance(),
+				XmlElementDeclAnnotationDefinition.instance(),
+				XmlElementsAnnotationDefinition.instance(),
+				XmlElementWrapperAnnotationDefinition.instance(),
+				XmlEnumAnnotationDefinition.instance(),
+				XmlEnumValueAnnotationDefinition.instance(),
+				XmlIDAnnotationDefinition.instance(),
+				XmlIDREFAnnotationDefinition.instance(),
+				XmlInlineBinaryDataAnnotationDefinition.instance(),
+				XmlListAnnotationDefinition.instance(),
+				XmlMimeTypeAnnotationDefinition.instance(),
+				XmlMixedAnnotationDefinition.instance(),
+				XmlRegistryAnnotationDefinition.instance(),
+				XmlRootElementAnnotationDefinition.instance(),
+				XmlSchemaAnnotationDefinition.instance(),
+				XmlSeeAlsoAnnotationDefinition.instance(),
+				XmlTransientAnnotationDefinition.instance(),
+				XmlTypeAnnotationDefinition.instance(),
+				XmlValueAnnotationDefinition.instance()};
+	}
+	
+	@Override
+	protected NestableAnnotationDefinition[] buildNestableAnnotationDefinitions() {
+		return new NestableAnnotationDefinition[] {
+			XmlElementRefAnnotationDefinition.instance(),
+			XmlJavaTypeAdapterAnnotationDefinition.instance(),
+			XmlSchemaTypeAnnotationDefinition.instance()
+		};
+	}
+	
+	// ********** resource models **********
+	
+	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
+		if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_CONTENT_TYPE)) {
+			return JptCommonCorePlugin.JAVA_SOURCE_RESOURCE_TYPE;
+		}
+		else if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_PACKAGE_INFO_CONTENT_TYPE)) {
+			return JptCommonCorePlugin.JAVA_SOURCE_PACKAGE_INFO_RESOURCE_TYPE;
+		}
+		throw new IllegalArgumentException(contentType.toString());
+	}
+	
+	@Override
+	protected JaxbResourceModelProvider[] buildResourceModelProviders() {
+		// order should not be important here
+		return new JaxbResourceModelProvider[] {
+			JavaResourceModelProvider.instance(),
+			JavaPackageInfoResourceModelProvider.instance()};
+	}
+	
+	
+	// ********** Java attribute mappings **********
+	
+	@Override
+	protected void addSpecifiedJavaAttributeMappingDefinitionsTo(ArrayList<JavaAttributeMappingDefinition> definitions) {
+		definitions.add(JavaXmlAnyAttributeMappingDefinition.instance());
+		definitions.add(JavaXmlAnyElementMappingDefinition.instance());
+		definitions.add(JavaXmlAttributeMappingDefinition.instance());
+		definitions.add(JavaXmlElementMappingDefinition.instance());
+		definitions.add(JavaXmlTransientMappingDefinition.instance());
+		definitions.add(JavaXmlValueMappingDefinition.instance());
+	}
+	
+	@Override
+	protected void addDefaultJavaAttributeMappingDefinitionsTo(ArrayList<DefaultJavaAttributeMappingDefinition> definitions) {
+		definitions.add(JavaXmlElementMappingDefinition.instance());
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java
index 58120fa9ae..d37260c1b5 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb21/GenericJaxb_2_1_PlatformDefinition.java
@@ -9,63 +9,17 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.core.internal.jaxb21;
 
-import java.util.ArrayList;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jpt.common.core.JptCommonCorePlugin;
-import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.jaxb.core.GenericJaxbPlatform;
 import org.eclipse.jpt.jaxb.core.JaxbFactory;
-import org.eclipse.jpt.jaxb.core.JaxbResourceModelProvider;
-import org.eclipse.jpt.jaxb.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jaxb.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.AbstractJaxbPlatformDefinition;
-import org.eclipse.jpt.jaxb.core.internal.JavaPackageInfoResourceModelProvider;
-import org.eclipse.jpt.jaxb.core.internal.JavaResourceModelProvider;
-import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAnyAttributeMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAnyElementMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlAttributeMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlElementMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlTransientMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.context.java.JavaXmlValueMappingDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAccessorOrderAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAccessorTypeAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAnyAttributeAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAnyElementAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAttachmentRefAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlAttributeAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementDeclAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementRefAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementWrapperAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlElementsAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlEnumAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlEnumValueAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlIDAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlIDREFAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlInlineBinaryDataAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlJavaTypeAdapterAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlListAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlMimeTypeAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlMixedAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlRegistryAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlRootElementAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSchemaAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSchemaTypeAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlSeeAlsoAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlTransientAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlTypeAnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.internal.resource.java.XmlValueAnnotationDefinition;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt.jaxb.core.resource.java.NestableAnnotationDefinition;
 
 public class GenericJaxb_2_1_PlatformDefinition
-	extends  AbstractJaxbPlatformDefinition
-{
+		extends  AbstractJaxb_2_1_PlatformDefinition {
+	
 	// singleton
 	private static final JaxbPlatformDefinition INSTANCE = new GenericJaxb_2_1_PlatformDefinition();
-
+	
 	/**
 	 * Return the singleton.
 	 */
@@ -81,102 +35,8 @@ public class GenericJaxb_2_1_PlatformDefinition
 	public JaxbPlatformDescription getDescription() {
 		return GenericJaxbPlatform.VERSION_2_1;
 	}
-
+	
 	public JaxbFactory getFactory() {
 		return GenericJaxb_2_1_Factory.instance();
 	}
-	
-	@Override
-	protected AnnotationDefinition[] buildAnnotationDefinitions() {
-		return new AnnotationDefinition[] {
-				XmlAccessorOrderAnnotationDefinition.instance(),
-				XmlAccessorTypeAnnotationDefinition.instance(),
-				XmlAnyAttributeAnnotationDefinition.instance(),
-				XmlAnyElementAnnotationDefinition.instance(),
-				XmlAttachmentRefAnnotationDefinition.instance(),
-				XmlAttributeAnnotationDefinition.instance(),
-				XmlElementAnnotationDefinition.instance(),
-				XmlElementDeclAnnotationDefinition.instance(),
-				XmlElementsAnnotationDefinition.instance(),
-				XmlElementWrapperAnnotationDefinition.instance(),
-				XmlEnumAnnotationDefinition.instance(),
-				XmlEnumValueAnnotationDefinition.instance(),
-				XmlIDAnnotationDefinition.instance(),
-				XmlIDREFAnnotationDefinition.instance(),
-				XmlInlineBinaryDataAnnotationDefinition.instance(),
-				XmlListAnnotationDefinition.instance(),
-				XmlMimeTypeAnnotationDefinition.instance(),
-				XmlMixedAnnotationDefinition.instance(),
-				XmlRegistryAnnotationDefinition.instance(),
-				XmlRootElementAnnotationDefinition.instance(),
-				XmlSchemaAnnotationDefinition.instance(),
-				XmlSeeAlsoAnnotationDefinition.instance(),
-				XmlTransientAnnotationDefinition.instance(),
-				XmlTypeAnnotationDefinition.instance(),
-				XmlValueAnnotationDefinition.instance()};
-	}
-
-	@Override
-	protected NestableAnnotationDefinition[] buildNestableAnnotationDefinitions() {
-		return new NestableAnnotationDefinition[] {
-			XmlElementRefAnnotationDefinition.instance(),
-			XmlJavaTypeAdapterAnnotationDefinition.instance(),
-			XmlSchemaTypeAnnotationDefinition.instance()
-		};
-	}
-	
-	// ********** resource models **********
-	
-	public JptResourceType getMostRecentSupportedResourceType(IContentType contentType) {
-		if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAVA_SOURCE_RESOURCE_TYPE;
-		}
-		else if (contentType.equals(JptCommonCorePlugin.JAVA_SOURCE_PACKAGE_INFO_CONTENT_TYPE)) {
-			return JptCommonCorePlugin.JAVA_SOURCE_PACKAGE_INFO_RESOURCE_TYPE;
-		}
-//		else if (contentType.equals(JptCorePlugin.JAR_CONTENT_TYPE)) {
-//			return JptCorePlugin.JAR_RESOURCE_TYPE;
-//		}
-//		else if (contentType.equals(JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE)) {
-//			return JptCorePlugin.PERSISTENCE_XML_1_0_RESOURCE_TYPE;
-//		}
-//		else if (contentType.equals(JptCorePlugin.ORM_XML_CONTENT_TYPE)) {
-//			return JptCorePlugin.ORM_XML_1_0_RESOURCE_TYPE;
-//		}
-		throw new IllegalArgumentException(contentType.toString());
-	}
-	
-	@Override
-	protected JaxbResourceModelProvider[] buildResourceModelProviders() {
-		// order should not be important here
-		return new JaxbResourceModelProvider[] {
-			JavaResourceModelProvider.instance(),
-			JavaPackageInfoResourceModelProvider.instance()};
-	}
-
-	// ********** Java attribute mappings **********
-	
-	@Override
-	protected void addSpecifiedJavaAttributeMappingDefinitionsTo(ArrayList<JavaAttributeMappingDefinition> definitions) {
-		definitions.add(JavaXmlAnyAttributeMappingDefinition.instance());
-		definitions.add(JavaXmlAnyElementMappingDefinition.instance());
-		definitions.add(JavaXmlAttributeMappingDefinition.instance());
-		definitions.add(JavaXmlElementMappingDefinition.instance());
-		definitions.add(JavaXmlTransientMappingDefinition.instance());
-		definitions.add(JavaXmlValueMappingDefinition.instance());
-	}
-
-	@Override
-	protected void addDefaultJavaAttributeMappingDefinitionsTo(ArrayList<DefaultJavaAttributeMappingDefinition> definitions) {
-		definitions.add(JavaXmlElementMappingDefinition.instance());
-	}
-	
-//	// ********** Mapping Files **********
-//	
-//	@Override
-//	protected ResourceDefinition[] buildResourceDefinitions() {
-//		return new ResourceDefinition[] {
-//			GenericPersistenceXmlDefinition.instance(),
-//			GenericOrmXmlDefinition.instance()};
-//	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/AbstractJaxb_2_2_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/AbstractJaxb_2_2_PlatformDefinition.java
new file mode 100644
index 0000000000..37ed7e7a15
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/AbstractJaxb_2_2_PlatformDefinition.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.core.internal.jaxb22;
+
+import org.eclipse.jpt.jaxb.core.internal.jaxb21.AbstractJaxb_2_1_PlatformDefinition;
+
+public abstract class AbstractJaxb_2_2_PlatformDefinition
+		extends AbstractJaxb_2_1_PlatformDefinition {
+	
+	protected AbstractJaxb_2_2_PlatformDefinition() {
+		super();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java
index b7683bc4ea..adc1b32c67 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/jaxb22/GenericJaxb_2_2_PlatformDefinition.java
@@ -10,13 +10,14 @@
 package org.eclipse.jpt.jaxb.core.internal.jaxb22;
 
 import org.eclipse.jpt.jaxb.core.GenericJaxbPlatform;
-import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_PlatformDefinition;
+import org.eclipse.jpt.jaxb.core.JaxbFactory;
+import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_Factory;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
 
 
 public class GenericJaxb_2_2_PlatformDefinition
-		extends GenericJaxb_2_1_PlatformDefinition {
+		extends AbstractJaxb_2_2_PlatformDefinition {
 	
 	// singleton
 	private static final JaxbPlatformDefinition INSTANCE = new GenericJaxb_2_2_PlatformDefinition();
@@ -33,8 +34,11 @@ public class GenericJaxb_2_2_PlatformDefinition
 	}
 	
 	
-	@Override
 	public JaxbPlatformDescription getDescription() {
 		return GenericJaxbPlatform.VERSION_2_2;
 	}
+	
+	public JaxbFactory getFactory() {
+		return GenericJaxb_2_1_Factory.instance();
+	}
 }