Systemtap: Replacing access to preferences by non deprecated methods

16 files changed, 79 insertions, 96 deletions

diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java
index 6c02d10b1d..ff626d5019 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java
@@ -24,7 +24,6 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.DMResponse;
  * @author patrickm
  *
  */
-@SuppressWarnings("deprecation")
 public final class ClientSession extends Thread {
 	
 	private static ClientSession instance = null;
@@ -38,12 +37,12 @@ public final class ClientSession extends Thread {
 	private ClientSession () {
 		// only happens once
 		
-		hostname = ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME);
-    	portnumber = ConsoleLogPlugin.getDefault().getPluginPreferences().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER);
-    	mbox = new TreeMap<Integer, LinkedBlockingQueue<byte[]>> ();
-    	connected = createConnection ();
-    	scriptnumber = 15;
-    	if (connected) this.start();
+		hostname = ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME);
+		portnumber = ConsoleLogPlugin.getDefault().getPreferenceStore().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER);
+		mbox = new TreeMap<Integer, LinkedBlockingQueue<byte[]>> ();
+		connected = createConnection ();
+		scriptnumber = 15;
+		if (connected) this.start();
 	}
 	
 	/**
@@ -245,41 +244,41 @@ public final class ClientSession extends Thread {
      */
 	public boolean createConnection () {
 
-    	final DMRequest ccpacket = new DMRequest (DMRequest.CREATE_CONN, 0, 0, 0);
-    	final byte buffer[] = new byte[DMResponse.packetsize];
-    	final DMResponse respacket;
-    	hostname = ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME);
-    	portnumber = ConsoleLogPlugin.getDefault().getPluginPreferences().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER);
-    	
-    	OutputStream out = null;
-    	try {
-    		
-    		Socket tmp = new Socket(hostname, portnumber);
-      		out = tmp.getOutputStream();
-    		in = tmp.getInputStream();
-    		out.write(ccpacket.getData());
-    		out.flush();
-    		in.read(buffer, 0, buffer.length);
-    		respacket = new DMResponse (buffer);
-    		
-    	} catch (final UnknownHostException uhe) {
-    		new ErrorMessage("Unknown host!", "See stderr for more details").open();
-    		System.err.println("Unknown host: " + uhe.getMessage());
-    		return false;
-    	} catch (final IOException ioe) {
-    		new ErrorMessage("Connection I/O error!", "See stderr for more details").open();
-    		System.err.println("Con I/O error: " + ioe.getMessage());
-    		//ioe.printStackTrace();
-    		return false;
-    	}
-    	
-    	if (!respacket.isValid())
-    	{
-    		return false;}
+		final DMRequest ccpacket = new DMRequest (DMRequest.CREATE_CONN, 0, 0, 0);
+		final byte buffer[] = new byte[DMResponse.packetsize];
+		final DMResponse respacket;
+		hostname = ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME);
+		portnumber = ConsoleLogPlugin.getDefault().getPreferenceStore().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER);
+
+		OutputStream out = null;
+		try {
+
+			Socket tmp = new Socket(hostname, portnumber);
+			out = tmp.getOutputStream();
+			in = tmp.getInputStream();
+			out.write(ccpacket.getData());
+			out.flush();
+			in.read(buffer, 0, buffer.length);
+			respacket = new DMResponse (buffer);
+
+		} catch (final UnknownHostException uhe) {
+			new ErrorMessage("Unknown host!", "See stderr for more details").open();
+			System.err.println("Unknown host: " + uhe.getMessage());
+			return false;
+		} catch (final IOException ioe) {
+			new ErrorMessage("Connection I/O error!", "See stderr for more details").open();
+			System.err.println("Con I/O error: " + ioe.getMessage());
+			//ioe.printStackTrace();
+			return false;
+		}
+
+		if (!respacket.isValid())
+		{
+			return false;}
+
 
- 	
-    	clientID = respacket.getclientID();
-    	return true;
+			clientID = respacket.getclientID();
+			return true;
 	}
 	
 	/**
@@ -324,4 +323,4 @@ public final class ClientSession extends Thread {
 //
 //    	return rc;
 	}
-}
\ No newline at end of file
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java
index a8056ea741..d505420ccc 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java
@@ -11,7 +11,6 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPref
 
 import java.io.*;
 
-@SuppressWarnings("deprecation")
 public class ScpClient {
 	
 	private Session session;
@@ -20,8 +19,8 @@ public class ScpClient {
 	//public static void main(String[] arg){
      
   
-      String user=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER);
-      String host=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME);
+      String user=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER);
+      String host=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME);
       
       
       //System.out.println(lfile + " " + rfile);
@@ -34,7 +33,7 @@ public class ScpClient {
       // username and password will be given via UserInfo interface.
       //UserInfo ui=new MyUserInfo();
       //session.setUserInfo(ui);
-      session.setPassword(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
+      session.setPassword(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
       java.util.Properties config = new java.util.Properties();
                       config.put("StrictHostKeyChecking", "no");
                       session.setConfig(config); 
@@ -231,4 +230,4 @@ public class ScpClient {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java
index 4d5da47e24..a164766e6f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java
@@ -9,7 +9,6 @@ import com.jcraft.jsch.*;
 import java.io.*;
 import java.util.ArrayList;
 
-@SuppressWarnings("deprecation")
 public class ScpExec implements Runnable {
 	
 	private Session session;
@@ -53,14 +52,14 @@ public class ScpExec implements Runnable {
 	
 	protected boolean init()
 	{
-	  String user=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER);
-      String host=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME);
+	  String user=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER);
+      String host=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME);
       try{
       JSch jsch=new JSch();
       
       session=jsch.getSession(user, host, 22);
 
-      session.setPassword(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
+      session.setPassword(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
       
       java.util.Properties config = new java.util.Properties();
                       config.put("StrictHostKeyChecking", "no");
@@ -300,4 +299,4 @@ public class ScpExec implements Runnable {
 	public static final int ERROR_STREAM = 0;
 	public static final int INPUT_STREAM = 1;
 
-}
\ No newline at end of file
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java
index dd81c63f3b..d3f728bd58 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java
@@ -15,7 +15,6 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.events.SelectionEvent;
 
 
-@SuppressWarnings("deprecation")
 public class SCPDetails extends Dialog {
 	private Text userText;
 	private Text passwordText;
@@ -51,7 +50,7 @@ public class SCPDetails extends Dialog {
 		data.horizontalAlignment = SWT.FILL;
 		userText = new Text(shell, SWT.SINGLE | SWT.BORDER);
 		userText.setLayoutData(data);
-		userText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER));
+		userText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER));
 		
 		data = new GridData();
 		data.grabExcessHorizontalSpace = false;
@@ -66,7 +65,7 @@ public class SCPDetails extends Dialog {
 		passwordText = new Text(shell, SWT.SINGLE | SWT.BORDER);
 		passwordText.setEchoChar('*');
 		passwordText.setLayoutData(data);
-		passwordText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
+		passwordText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
 		
 		
 		data = new GridData();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java
index a412969958..e79eb57b0e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java
@@ -29,9 +29,8 @@ public class SelectServerDialog extends Dialog {
 		super(parent);
 	}
 	
-	@SuppressWarnings("deprecation")
 	public boolean open() {
-		if (ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)) {
+		if (ConsoleLogPlugin.getDefault().getPreferenceStore().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)) {
 			return true;
 		}
 		result = false;
@@ -59,7 +58,7 @@ public class SelectServerDialog extends Dialog {
 		data.horizontalAlignment = SWT.FILL;
 		hostText = new Text(shell, SWT.SINGLE | SWT.BORDER);
 		hostText.setLayoutData(data);
-		hostText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME));
+		hostText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME));
 			
 		data = new GridData();
 		data.grabExcessHorizontalSpace = false;
@@ -73,7 +72,7 @@ public class SelectServerDialog extends Dialog {
 		data.horizontalAlignment = SWT.FILL;
 		userText = new Text(shell, SWT.SINGLE | SWT.BORDER);
 		userText.setLayoutData(data);
-		userText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER));
+		userText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER));
 		
 		data = new GridData();
 		data.grabExcessHorizontalSpace = false;
@@ -88,7 +87,7 @@ public class SelectServerDialog extends Dialog {
 		passwordText = new Text(shell, SWT.SINGLE | SWT.BORDER);
 		passwordText.setEchoChar('*');
 		passwordText.setLayoutData(data);
-		passwordText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
+		passwordText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD));
 		
 		
 		data = new GridData();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java
index fddb69175c..e7e6fbce01 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java
@@ -33,10 +33,8 @@ public class ConsoleLogPlugin extends AbstractUIPlugin {
 	/**
 	 * This method is called upon plug-in activation
 	 */
-	@SuppressWarnings("deprecation")
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
-		this.internalInitializeDefaultPluginPreferences();
 	}
 
 	/**
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java
index efadd52b15..ac948e8dce 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java
@@ -21,7 +21,6 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPref
  * @author patrickm
  * 
  */
-@SuppressWarnings("deprecation")
 public class DMRequest extends DMPacket {
 
 	// packet size
@@ -107,7 +106,7 @@ public class DMRequest extends DMPacket {
 	    char a[] = new char[20];
 		for (int i = 0; i < 20 ; i++)
 			  a[i] = ' ';
-		String b= ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER);
+		String b= ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER);
 		b.getChars(0, b.length(), a, 0);
 		
 		b = null;
@@ -121,7 +120,7 @@ public class DMRequest extends DMPacket {
 			dos.writeInt(scriptID);
 			dos.writeInt(clientID);
 			dos.writeInt(0);
-			dos.writeInt(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER).length());
+			dos.writeInt(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER).length());
 			dos.writeBytes(b);
 		//	System.out.println(a.length + " " + a.toString().length() + " " + filename.substring(filename.lastIndexOf('/')).length());
 			dos.flush();
@@ -195,4 +194,4 @@ public class DMRequest extends DMPacket {
 				+ "\nScript #:\t" + scriptID + "\nFilename:\t" + filename + "\nClient ID:\t" + clientID
 				+ "\nData Size:\t" + size + "\n";
 	}
-}
\ No newline at end of file
+}
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java
index 4840ad0317..3bd602d229 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/src/org/eclipse/linuxtools/systemtap/ui/dashboard/actions/RunModuleAction.java
@@ -54,7 +54,6 @@ import org.eclipse.linuxtools.systemtap.ui.graphicalrun.structures.ChartStreamDa
  * @author Ryan Morse
  */
 
-@SuppressWarnings("deprecation")
 public class RunModuleAction extends Action implements IViewActionDelegate, IWorkbenchWindowActionDelegate {
 //	public RunModuleAction(){
 	//	buildEnablementChecks();
@@ -176,7 +175,7 @@ public class RunModuleAction extends Action implements IViewActionDelegate, IWor
 		fileName = module.script.getAbsolutePath();
 		String tmpfileName = fileName;
 		String serverfileName = fileName.substring(fileName.lastIndexOf('/')+1);
-		if(ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true &&
+		if(ConsoleLogPlugin.getDefault().getPreferenceStore().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true &&
 			new SelectServerDialog(fWindow.getShell()).open() == false)
 			return;
         	
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/internal/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/internal/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
index 38776811e8..858602092e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/internal/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/internal/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
@@ -28,7 +28,6 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.linuxtools.systemtap.ui.dashboard.internal.DashboardPlugin;
 import org.eclipse.linuxtools.systemtap.ui.dashboard.preferences.DashboardPreferenceConstants;
 
-@SuppressWarnings("deprecation")
 public class ScriptDetails extends Dialog {
 	private Text dirText;
 	private Text scriptText;
@@ -72,7 +71,7 @@ public class ScriptDetails extends Dialog {
 		data.horizontalAlignment = SWT.FILL;
 		dirText = new Text(shell, SWT.SINGLE | SWT.BORDER);
 		dirText.setLayoutData(data);
-		dirText.setText(DashboardPlugin.getDefault().getPluginPreferences().getString(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR));
+		dirText.setText(DashboardPlugin.getDefault().getPreferenceStore().getString(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR));
 		
 		data = new GridData();
 		data.grabExcessHorizontalSpace = false;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/internal/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/internal/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java
index d7fb95e5d3..159ad6814f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/internal/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphicalrun/src/org/eclipse/linuxtools/internal/systemtap/ui/graphicalrun/actions/RunScriptChartAction.java
@@ -45,7 +45,6 @@ import org.eclipse.linuxtools.systemtap.ui.ide.structures.StapErrorParser;
  * and send the output to both the <code>ScriptConsole</code> window and a <code>DataSet</code>.
  * @author Ryan Morse
  */
-@SuppressWarnings("deprecation")
 public class RunScriptChartAction extends RunScriptAction implements IWorkbenchWindowActionDelegate {
 	public RunScriptChartAction() {
 		super();
@@ -68,7 +67,7 @@ public class RunScriptChartAction extends RunScriptAction implements IWorkbenchW
 	public void run() {
 		LogManager.logDebug("Start run:", this); //$NON-NLS-1$
 		continueRun = true;
-		if(ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true &&
+		if(ConsoleLogPlugin.getDefault().getPreferenceStore().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true &&
 			new SelectServerDialog(fWindow.getShell()).open() == false)
 			return;
 	
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java
index bc4edd3669..76882da29d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/ui/graphingapi/ui/graphs/AGraph.java
@@ -13,9 +13,9 @@ package org.eclipse.linuxtools.systemtap.ui.graphingapi.ui.graphs;
 
 import java.util.LinkedList;
 
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.linuxtools.internal.systemtap.ui.graphingapi.ui.GraphingAPIUIPlugin;
 import org.eclipse.linuxtools.internal.systemtap.ui.graphingapi.ui.Localization;
 import org.eclipse.linuxtools.systemtap.ui.graphingapi.nonui.IGraphColorConstants;
@@ -34,7 +34,6 @@ import org.eclipse.swt.widgets.Button;
 
 
 
-@SuppressWarnings("deprecation")
 public abstract class AGraph extends AChart implements IGraph {
 	public AGraph(GraphComposite parent, int style, String title, IAdapter adapt) {
 		super(parent, style, title, adapt);
@@ -50,7 +49,7 @@ public abstract class AGraph extends AChart implements IGraph {
 		createAxis(Localization.getString("AGraph.xAxis"), xSeriesTicks, GraphAxis.HORIZONTAL);
 		createAxis(Localization.getString("AGraph.yAxis"), ySeriesTicks, GraphAxis.VERTICAL);
 		
-		GraphingAPIUIPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(propertyChangeListener);
+		GraphingAPIUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(propertyChangeListener);
 		
 		parent.addCheckOption(Localization.getString("AGraph.GridLines"), gridListener);
 		if(adapter.getSeriesCount() > 1)
@@ -159,7 +158,7 @@ public abstract class AGraph extends AChart implements IGraph {
 	}
 
 	public void dispose() {
-		GraphingAPIUIPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(propertyChangeListener);
+		GraphingAPIUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(propertyChangeListener);
 
 		parent.removeCheckOption(Localization.getString("AGraph.Normalize"));
 		parent.removeCheckOption(Localization.getString("AGraph.GridLines"));
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java
index c7924cf26d..ef77f78760 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/IDEPlugin.java
@@ -14,11 +14,11 @@ package org.eclipse.linuxtools.internal.systemtap.ui.ide;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.eclipse.core.runtime.Preferences;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.internal.ConsoleLogPlugin;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPreferenceConstants;
 import org.eclipse.ui.IWorkbenchListener;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.linuxtools.systemtap.ui.consolelog.actions.StopScriptAction;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -30,7 +30,6 @@ import org.osgi.framework.BundleContext;
  * @see org.eclipse.ui.plugin.AbstractUIPlugin
  * @author Ryan Morse
  */
-@SuppressWarnings("deprecation")
 public class IDEPlugin extends AbstractUIPlugin {
 	private IWorkbenchListener workbenchListener;
 	private static IDEPlugin plugin;
@@ -87,7 +86,7 @@ public class IDEPlugin extends AbstractUIPlugin {
 	 * Create an uri to be used to connect to the remote machine
 	 */
 	public URI createRemoteUri(String path) {
-		Preferences p = ConsoleLogPlugin.getDefault().getPluginPreferences();
+		IPreferenceStore p = ConsoleLogPlugin.getDefault().getPreferenceStore();
 		String user = p.getString(ConsoleLogPreferenceConstants.SCP_USER);
 		String host = p.getString(ConsoleLogPreferenceConstants.HOST_NAME);
 		if (path == null)
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/c/CEditor.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/c/CEditor.java
index f3ac143ece..4d288c3e6e 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/c/CEditor.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/c/CEditor.java
@@ -13,8 +13,6 @@ package org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.c;
 
 import java.util.ArrayList;
 
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.source.AnnotationRulerColumn;
@@ -22,6 +20,8 @@ import org.eclipse.jface.text.source.CompositeRuler;
 import org.eclipse.jface.text.source.IVerticalRuler;
 import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin;
 import org.eclipse.linuxtools.internal.systemtap.ui.ide.Localization;
 import org.eclipse.linuxtools.internal.systemtap.ui.ide.editors.stp.STPEditor;
@@ -48,7 +48,6 @@ import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
  * @author Henry Hughes
  * @author Ryan Morse
  */
-@SuppressWarnings("deprecation")
 public class CEditor extends AbstractDecoratedTextEditor {
 	private ColorManager colorManager;
 	/**
@@ -209,7 +208,7 @@ public class CEditor extends AbstractDecoratedTextEditor {
 		super();
 		LogManager.logDebug("Start CEditor:", this); //$NON-NLS-1$
 		internal_init();
-		IDEPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(cColorPropertyChangeListener);
+		IDEPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(cColorPropertyChangeListener);
 		LogManager.logDebug("End CEditor:", this); //$NON-NLS-1$
 	}
 	/**
@@ -235,7 +234,7 @@ public class CEditor extends AbstractDecoratedTextEditor {
 	public void dispose() {
 		LogManager.logDebug("Start dispose:", this); //$NON-NLS-1$
 		LogManager.logInfo("Disposing", this); //$NON-NLS-1$
-		IDEPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(cColorPropertyChangeListener);
+		IDEPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(cColorPropertyChangeListener);
 		colorManager.dispose();
 		super.dispose();
 		LogManager.logDebug("End dispose:", this); //$NON-NLS-1$
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java
index e02ab2b001..d470781408 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/views/KernelBrowserView.java
@@ -20,10 +20,10 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin;
@@ -46,7 +46,6 @@ import org.eclipse.ui.progress.UIJob;
  * @author Ryan Morse
  */
 
-@SuppressWarnings("deprecation")
 public class KernelBrowserView extends BrowserView {
 	private class KernelRefreshJob extends Job {
 		private boolean remote;
@@ -132,7 +131,7 @@ public class KernelBrowserView extends BrowserView {
 			}
 		};
 		viewer.addDoubleClickListener(dblClickListener);
-		IDEPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(propertyChangeListener);
+		IDEPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(propertyChangeListener);
 		LogManager.logDebug("End makeActions:", this); //$NON-NLS-1$
 	}
 
@@ -221,7 +220,7 @@ public class KernelBrowserView extends BrowserView {
 	public void dispose() {
 		LogManager.logInfo("Disposing", this); //$NON-NLS-1$
 		super.dispose();
-		IDEPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(propertyChangeListener);
+		IDEPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(propertyChangeListener);
 		if(null != viewer)
 			viewer.removeDoubleClickListener(dblClickListener);
 		dblClickListener = null;
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java
index 44b6060034..ae13d27b9c 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/systemtap/ui/ide/actions/RunScriptAction.java
@@ -17,10 +17,10 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 
-import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.ProgressMonitorPart;
 import org.eclipse.linuxtools.internal.systemtap.ui.ide.IDEPlugin;
@@ -55,7 +55,6 @@ import org.eclipse.ui.ide.ResourceUtil;
  * @author Ryan Morse
  */
 
-@SuppressWarnings("deprecation")
 public class RunScriptAction extends Action implements IWorkbenchWindowActionDelegate {
 	public RunScriptAction() {
 		super();
@@ -83,7 +82,7 @@ public class RunScriptAction extends Action implements IWorkbenchWindowActionDel
 	public void run() {
 		LogManager.logDebug("Start run:", this); //$NON-NLS-1$
 		continueRun = true;
-		if(ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true &&
+		if(ConsoleLogPlugin.getDefault().getPreferenceStore().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)!=true &&
 			new SelectServerDialog(fWindow.getShell()).open() == false)
 			return;
 
@@ -202,8 +201,8 @@ public class RunScriptAction extends Action implements IWorkbenchWindowActionDel
 	 */
 	
 	protected void getImportedTapsets(ArrayList<String> cmdList) {
-		Preferences pref = IDEPlugin.getDefault().getPluginPreferences();
-		String[] tapsets = pref.getString(IDEPreferenceConstants.P_TAPSETS).split(File.pathSeparator);
+		IPreferenceStore preferenceStore = IDEPlugin.getDefault().getPreferenceStore();
+		String[] tapsets = preferenceStore.getString(IDEPreferenceConstants.P_TAPSETS).split(File.pathSeparator);
 
 		//Get all imported tapsets
 		if(null != tapsets && tapsets.length > 0 && tapsets[0].trim().length() > 0) {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/src/org/eclipse/linuxtools/systemtap/ui/systemtapgui/Application.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/src/org/eclipse/linuxtools/systemtap/ui/systemtapgui/Application.java
index 14f7aaf721..18cb2eb0b8 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/src/org/eclipse/linuxtools/systemtap/ui/systemtapgui/Application.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.systemtapgui/src/org/eclipse/linuxtools/systemtap/ui/systemtapgui/Application.java
@@ -24,7 +24,6 @@ public class Application implements IPlatformRunnable {
 	 * 
 	 * @return an IPlatformRunnable condition, either EXIT_RESTART or EXIT_OK
 	 */
-	@SuppressWarnings("deprecation")
 	public Object run(Object args) throws Exception {
 		Display display = PlatformUI.createDisplay();