bug 263252 - removed jpa preferences page and associated preferences

3 files changed, 7 insertions, 66 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 b182b5817e..0f6fc09d30 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
@@ -30,6 +30,7 @@ import org.eclipse.jpt.core.internal.JpaModelManager;
 import org.eclipse.jpt.core.internal.platform.GenericJpaPlatformProvider;
 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.ComponentCore;
 import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
@@ -304,15 +305,6 @@ public class JptCorePlugin extends Plugin {
 	}
 	
 	/**
-	 * Return the default JPA library for creating new JPA projects
-	 */
-	public static String getDefaultJpaLibrary() {
-		return Platform.getPreferencesService().get(
-				JpaPreferenceConstants.PREF_DEFAULT_JPA_LIB, null,
-				new Preferences[] {getWorkspacePreferences(), getDefaultPreferences()});
-	}
-	
-	/**
 	 * Return the default JPA platform ID for creating new JPA projects
 	 */
 	public static String getDefaultJpaPlatformId() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java
index bc157f5847..e1163fa332 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java
@@ -19,21 +19,16 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 import org.eclipse.jdt.core.ElementChangedEvent;
 import org.eclipse.jdt.core.IElementChangedListener;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaElementDelta;
 import org.eclipse.jdt.core.IOpenable;
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jpt.core.JpaFile;
 import org.eclipse.jpt.core.JpaModel;
 import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JptCorePlugin;
-import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants;
 import org.eclipse.jpt.utility.internal.BitTools;
 import org.eclipse.jpt.utility.internal.StringTools;
 import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
@@ -93,14 +88,8 @@ public class JpaModelManager {
 	 * which will forward them to the JPA projects.
 	 */
 	private final IElementChangedListener javaElementChangeListener;
-
-	/**
-	 * Listen for changes to the "Default JPA Lib" preference
-	 * so we can update the corresponding classpath variable.
-	 */
-	private final IPropertyChangeListener preferencesListener;
-
-
+	
+	
 	// ********** singleton **********
 
 	private static final JpaModelManager INSTANCE = new JpaModelManager();
@@ -123,7 +112,6 @@ public class JpaModelManager {
 		this.resourceChangeListener = new ResourceChangeListener();
 		this.facetedProjectListener = new FacetedProjectListener();
 		this.javaElementChangeListener = new JavaElementChangeListener();
-		this.preferencesListener = new PreferencesListener();
 	}
 
 
@@ -139,7 +127,6 @@ public class JpaModelManager {
 			ResourcesPlugin.getWorkspace().addResourceChangeListener(this.resourceChangeListener);
 			FacetedProjectFramework.addListener(this.facetedProjectListener, IFacetedProjectEvent.Type.values());
 			JavaCore.addElementChangedListener(this.javaElementChangeListener);
-			JptCorePlugin.instance().getPluginPreferences().addPropertyChangeListener(this.preferencesListener);
 		} catch (RuntimeException ex) {
 			this.log(ex);
 			this.stop();
@@ -151,7 +138,6 @@ public class JpaModelManager {
 	 */
 	public synchronized void stop() throws Exception {
 		debug("*** STOP JPA model manager ***"); //$NON-NLS-1$
-		JptCorePlugin.instance().getPluginPreferences().removePropertyChangeListener(this.preferencesListener);
 		JavaCore.removeElementChangedListener(this.javaElementChangeListener);
 		FacetedProjectFramework.removeListener(this.facetedProjectListener);
 		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this.resourceChangeListener);
@@ -442,24 +428,8 @@ public class JpaModelManager {
 		}	
 		return false;
 	}
-
-	// ********** preference changed **********
-
-	/**
-	 * When the "Default JPA Lib" preference changes,
-	 * update the appropriate JDT Core classpath variable.
-	 */
-	/* private */ void preferenceChanged(PropertyChangeEvent event) {
-		if (event.getProperty() == JpaPreferenceConstants.PREF_DEFAULT_JPA_LIB) {
-			try {
-				JavaCore.setClasspathVariable("DEFAULT_JPA_LIB", new Path((String) event.getNewValue()), null); //$NON-NLS-1$
-			} catch (JavaModelException ex) {
-				this.log(ex);  // not sure what would cause this...
-			}
-		}
-	}
-
-
+	
+	
 	// ********** resource change listener **********
 
 	/**
@@ -515,27 +485,8 @@ public class JpaModelManager {
 			return StringTools.buildToStringFor(this);
 		}
 	}
-
-
-	// ********** preferences listener **********
-
-	/**
-	 * Forward the Preferences change event back to the JPA model manager.
-	 */
-	private class PreferencesListener implements IPropertyChangeListener {
-		PreferencesListener() {
-			super();
-		}
-		public void propertyChange(PropertyChangeEvent event) {
-			JpaModelManager.this.preferenceChanged(event);
-		}
-		@Override
-		public String toString() {
-			return StringTools.buildToStringFor(this);
-		}
-	}
-
-
+	
+	
 	// ********** debug **********
 
 	// @see JpaModelTests#testDEBUG()
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceConstants.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceConstants.java
index 190fdf53c8..bd78c29a02 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceConstants.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceConstants.java
@@ -14,7 +14,5 @@ package org.eclipse.jpt.core.internal.prefs;
  */
 public class JpaPreferenceConstants 
 {
-	public static final String PREF_DEFAULT_JPA_LIB = "defaultJpaLib";
-	
 	public static final String PREF_DEFAULT_JPA_PLATFORM = "defaultJpaPlatform";
 }