get JPA facet version platform config instead of duplicating in Platform factory

5 files changed, 28 insertions, 15 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java
index 95fe52e7c5..8fe7f7465a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
 import org.eclipse.jpt.jpa.core.context.java.JavaManagedTypeDefinition;
 import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
 import org.eclipse.jpt.jpa.core.jpa2.JpaProject2_0;
+import org.eclipse.jpt.jpa.core.jpa2_1.JpaProject2_1;
 import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager;
 import org.eclipse.jpt.jpa.db.ConnectionProfileFactory;
 import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar;
@@ -219,6 +220,7 @@ public interface JpaPlatform
 		 * Return the highest JPA specification version supported by the platform.
 		 * @see JpaProject#FACET_VERSION_STRING
 		 * @see JpaProject2_0#FACET_VERSION_STRING
+		 * @see JpaProject2_1#FACET_VERSION_STRING
 		 */
 		String getJpaVersion();
 
@@ -227,6 +229,7 @@ public interface JpaPlatform
 		 * specification version.
 		 * @see JpaProject#FACET_VERSION_STRING
 		 * @see JpaProject2_0#FACET_VERSION_STRING
+		 * @see JpaProject2_1#FACET_VERSION_STRING
 		 */
 		boolean isCompatibleWithJpaVersion(String jpaVersion);
 	}
@@ -261,10 +264,16 @@ public interface JpaPlatform
 		String getLabel();
 
 		/**
+		 * Return the config's JPA facet version or null if the extension
+		 * does <em>not</em> specify a JPA facet version.
+		 */
+		IProjectFacetVersion getJpaFacetVersion();
+
+		/**
 		 * Return whether the config's JPA platform supports the specified
 		 * JPA facet version. If the extension specifies a JPA facet version, it
 		 * must be the same as the specified JPA facet version. If the extension
-		 * does <em>not</em> specify a JPA facet verion, the config's JPA
+		 * does <em>not</em> specify a JPA facet version, the config's JPA
 		 * platform supports all JPA facet versions.
 		 * @exception IllegalArgumentException if the specified facet version is
 		 * not for a JPA facet
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformFactory.java
index 5f73b61aab..f51c5013ca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 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.
@@ -14,10 +14,10 @@ import org.eclipse.jpt.common.utility.internal.VersionComparator;
 import org.eclipse.jpt.jpa.core.JpaPlatform;
 import org.eclipse.jpt.jpa.core.JpaPlatformFactory;
 import org.eclipse.jpt.jpa.core.JpaPlatformVariation;
-import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.AccessType;
 import org.eclipse.jpt.jpa.core.internal.jpa1.GenericJpaFactory;
 import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar1_0;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 
 /**
  * All the state in the JPA platform should be "static" (i.e. unchanging once
@@ -46,7 +46,7 @@ public class GenericJpaPlatformFactory
 	public JpaPlatform buildJpaPlatform(JpaPlatform.Config config) {
 		return new GenericJpaPlatform(
 			config,
-			this.buildJpaVersion(),
+			this.buildJpaVersion(config.getJpaFacetVersion()),
 			new GenericJpaFactory(),
 			new JpaAnnotationProvider(GenericJpaAnnotationDefinitionProvider.instance()),
 			GenericJpaPlatformProvider.instance(),
@@ -54,8 +54,8 @@ public class GenericJpaPlatformFactory
 			JPQLGrammar1_0.instance());
 	}
 
-	private JpaPlatform.Version buildJpaVersion() {
-		return new GenericJpaPlatformVersion(JpaProject.FACET_VERSION_STRING);
+	private JpaPlatform.Version buildJpaVersion(IProjectFacetVersion jpaFacetVersion) {
+		return new GenericJpaPlatformVersion(jpaFacetVersion.getVersionString());
 	}
 
 	protected JpaPlatformVariation buildJpaPlatformVariation() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformFactory.java
index b0d03a5084..fca2d28b62 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 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.
@@ -17,8 +17,8 @@ import org.eclipse.jpt.jpa.core.context.AccessType;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatformFactory.GenericJpaPlatformVersion;
 import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.jpa2.JpaProject2_0;
 import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar2_0;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 
 /**
  * All the state in the JPA platform should be "static" (i.e. unchanging once
@@ -39,7 +39,7 @@ public class Generic2_0JpaPlatformFactory
 	public JpaPlatform buildJpaPlatform(JpaPlatform.Config config) {
 		return new GenericJpaPlatform(
 			config,
-			this.buildJpaVersion(),
+			this.buildJpaVersion(config.getJpaFacetVersion()),
 			new GenericJpaFactory2_0(),
 			new JpaAnnotationProvider(Generic2_0JpaAnnotationDefinitionProvider.instance()),
 			Generic2_0JpaPlatformProvider.instance(),
@@ -47,8 +47,8 @@ public class Generic2_0JpaPlatformFactory
 			JPQLGrammar2_0.instance());
 	}
 
-	private JpaPlatform.Version buildJpaVersion() {
-		return new GenericJpaPlatformVersion(JpaProject2_0.FACET_VERSION_STRING);
+	private JpaPlatform.Version buildJpaVersion(IProjectFacetVersion jpaFacetVersion) {
+		return new GenericJpaPlatformVersion(jpaFacetVersion.getVersionString());
 	}
 
 	protected JpaPlatformVariation buildJpaPlatformVariation() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/Generic2_1JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/Generic2_1JpaPlatformFactory.java
index 14e247a7c0..2b9e1f34d5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/Generic2_1JpaPlatformFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/Generic2_1JpaPlatformFactory.java
@@ -17,8 +17,8 @@ import org.eclipse.jpt.jpa.core.context.AccessType;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform;
 import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatformFactory.GenericJpaPlatformVersion;
 import org.eclipse.jpt.jpa.core.internal.JpaAnnotationProvider;
-import org.eclipse.jpt.jpa.core.jpa2_1.JpaProject2_1;
 import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar2_1;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 
 /**
  * All the state in the JPA platform should be "static" (i.e. unchanging once
@@ -39,7 +39,7 @@ public class Generic2_1JpaPlatformFactory
 	public JpaPlatform buildJpaPlatform(JpaPlatform.Config config) {
 		return new GenericJpaPlatform(
 			config,
-			this.buildJpaVersion(),
+			this.buildJpaVersion(config.getJpaFacetVersion()),
 			new GenericJpaFactory2_1(),
 			new JpaAnnotationProvider(Generic2_1JpaAnnotationDefinitionProvider.instance()),
 			Generic2_1JpaPlatformProvider.instance(),
@@ -47,8 +47,8 @@ public class Generic2_1JpaPlatformFactory
 			JPQLGrammar2_1.instance());
 	}
 
-	private JpaPlatform.Version buildJpaVersion() {
-		return new GenericJpaPlatformVersion(JpaProject2_1.FACET_VERSION_STRING);
+	private JpaPlatform.Version buildJpaVersion(IProjectFacetVersion jpaFacetVersion) {
+		return new GenericJpaPlatformVersion(jpaFacetVersion.getVersionString());
 	}
 
 	protected JpaPlatformVariation buildJpaPlatformVariation() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformConfig.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformConfig.java
index 66fe4c6030..d1a14e7592 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformConfig.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformConfig.java
@@ -57,6 +57,10 @@ class InternalJpaPlatformConfig
 		return this.factoryClassName;
 	}
 
+	public IProjectFacetVersion getJpaFacetVersion() {
+		return this.jpaFacetVersion;
+	}
+
 	void setJpaFacetVersion(IProjectFacetVersion jpaFacetVersion) {
 		this.jpaFacetVersion = jpaFacetVersion;
 	}