[Bug 228764] - JPA facet wizard page: no default platform specified if previous default platform is no longer available

2 files changed, 17 insertions, 1 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
index 34fec11218..e957c69312 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java
@@ -26,6 +26,7 @@ import org.eclipse.jpt.core.internal.JpaModelManager;
 import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform;
 import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry;
 import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants;
+import org.eclipse.jpt.core.internal.prefs.JpaPreferenceInitializer;
 import org.eclipse.jst.j2ee.internal.J2EEConstants;
 import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
 import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
@@ -272,9 +273,17 @@ public class JptCorePlugin extends Plugin {
 	 * Return the default JPA platform ID for creating new JPA projects
 	 */
 	public static String getDefaultJpaPlatformId() {
-		return Platform.getPreferencesService().get(
+		String platformId = 
+			Platform.getPreferencesService().get(
 				JpaPreferenceConstants.PREF_DEFAULT_JPA_PLATFORM, GenericJpaPlatform.ID,
 				new Preferences[] {getWorkspacePreferences(), getDefaultPreferences()});
+		if (! JpaPlatformRegistry.instance().containsPlatform(platformId)) {
+			platformId = 
+				Platform.getPreferencesService().get(
+					JpaPreferenceConstants.PREF_DEFAULT_JPA_PLATFORM, GenericJpaPlatform.ID,
+					new Preferences[] {getDefaultPreferences()});
+		}
+		return platformId;
 	}
 	
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java
index e59661ab10..44adcfcb0a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java
@@ -141,6 +141,13 @@ public class JpaPlatformRegistry {
 	}
 	
 	/**
+	 * Return whether the platform id is registered
+	 */
+	public boolean containsPlatform(String platformId) {
+		return this.jpaPlatformConfigurationElements.containsKey(platformId);
+	}
+	
+	/**
 	 * Return the label for the JPA platform with the specified ID.
 	 * This does not activate the JPA platform's plug-in.
 	 */