Reorganized plugins.

10 files changed, 147 insertions, 117 deletions

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/.project b/debug/org.eclipse.ptp.debug.sdm.ui/.project
index 8a6e7798f..18b687c4e 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/.project
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.ptp.debug.external.ui</name>
+	<name>org.eclipse.ptp.debug.sdm.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF
index 734869ec3..fcfd7db3e 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PTP Debug External UI Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.debug.external.ui; singleton:=true
+Bundle-SymbolicName: org.eclipse.ptp.debug.sdm.ui;singleton:=true
 Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.debug.external.ui.ExternalUIPlugin
+Bundle-Activator: org.eclipse.ptp.debug.sdm.ui.SDMDebugUIPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -15,5 +15,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ptp.ui,
  org.eclipse.ptp.core,
  org.eclipse.ptp.remote,
- org.eclipse.ptp.rm.remote
+ org.eclipse.ptp.rm.remote,
+ org.eclipse.ptp.debug.sdm.core
 Eclipse-LazyStart: true
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml b/debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml
index 8c8a159f7..a0400ffd6 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-   <!--
-   <extension
-         point="org.eclipse.ptp.debug.ui.PDebuggerPage">
-      <debugPage
-            class="org.eclipse.ptp.debug.external.internal.ui.SDMPage"
-            debuggerID="org.eclipse.ptp.debug.external.sdm"
-            id="org.eclipse.ptp.debug.external.ui.SDMPage">
-      </debugPage>
-   </extension>
-   //-->
-   <extension
+    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             name="%SDMPreferencePage.name"
             category="org.eclipse.ptp.debug.ui.PDebugPreferencePage"
-            class="org.eclipse.ptp.debug.external.internal.ui.preferences.SDMPreferencePage"
-            id="org.eclipse.ptp.debug.external.ui.SDMPreferencePage">
+            class="org.eclipse.ptp.debug.sdm.internal.ui.preferences.SDMPreferencePage"
+            id="org.eclipse.ptp.debug.sdm.ui.SDMPreferencePage">
       </page>
    </extension>
    <extension
          point="org.eclipse.ptp.debug.ui.PDebuggerPage">
       <debuggerPage
-            class="org.eclipse.ptp.debug.external.internal.ui.SDMPage"
-            debuggerID="org.eclipse.ptp.debug.external.sdm"
+            class="org.eclipse.ptp.debug.sdm.internal.ui.SDMPage"
+            debuggerID="org.eclipse.ptp.debug.sdm"
             id="org.eclipse.ptp.debug.sdm.SDMPage"/>
    </extension>
 </plugin>
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/ExternalDebugUIMessages.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.java
index 1da9f615d..b26c1af5a 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/ExternalDebugUIMessages.java
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.java
@@ -16,7 +16,7 @@
  * 
  * LA-CC 04-115
  *******************************************************************************/
-package org.eclipse.ptp.debug.external.internal.ui;
+package org.eclipse.ptp.debug.sdm.internal.ui;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -25,11 +25,11 @@ import java.util.ResourceBundle;
  * @author Clement chu
  *
  */
-public class ExternalDebugUIMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.external.internal.ui.ExternalDebugUIMessages";
+public class Messages {
+	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.sdm.internal.ui.Messages";
 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
 
-	private ExternalDebugUIMessages() {
+	private Messages() {
 	}
 
 	public static String getString(String key) {
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/ExternalDebugUIMessages.properties b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.properties
index 95dd47056..95dd47056 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/ExternalDebugUIMessages.properties
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.properties
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/SDMPage.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/SDMPage.java
index 9674a7431..3cb9cd8ea 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/SDMPage.java
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/SDMPage.java
@@ -8,20 +8,20 @@
  * Contributors:
  *     QNX Software Systems - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.ptp.debug.external.internal.ui;
+package org.eclipse.ptp.debug.sdm.internal.ui;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Preferences;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
 import org.eclipse.ptp.core.PTPCorePlugin;
 import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
+import org.eclipse.ptp.debug.sdm.core.SDMDebugCorePlugin;
+import org.eclipse.ptp.debug.sdm.core.SDMPreferenceConstants;
 import org.eclipse.ptp.remote.IRemoteConnection;
 import org.eclipse.ptp.remote.IRemoteFileManager;
 import org.eclipse.ptp.remote.IRemoteProxyOptions;
@@ -81,7 +81,7 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 		comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		
 		Label label = new Label(comp, SWT.NONE);
-		label.setText(ExternalDebugUIMessages.getString("SDMDebuggerPage.path")); //$NON-NLS-1$
+		label.setText(Messages.getString("SDMDebuggerPage.path")); //$NON-NLS-1$
 		GridData gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
 		gd.horizontalSpan = 2;
 		label.setLayoutData(gd);
@@ -93,7 +93,7 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 		    	updateLaunchConfigurationDialog();
 			}
 		});
-		fRMDebuggerBrowseButton = createPushButton(comp, ExternalDebugUIMessages.getString("SDMDebuggerPage.browse"), null); //$NON-NLS-1$
+		fRMDebuggerBrowseButton = createPushButton(comp, Messages.getString("SDMDebuggerPage.browse"), null); //$NON-NLS-1$
 		fRMDebuggerBrowseButton.addSelectionListener(new SelectionAdapter() {
 		    @Override
 			public void widgetSelected(SelectionEvent e) {
@@ -105,7 +105,7 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 		});
 		
 		label = new Label(comp, SWT.NONE);
-		label.setText(ExternalDebugUIMessages.getString("SDMDebuggerPage.host")); //$NON-NLS-1$
+		label.setText(Messages.getString("SDMDebuggerPage.host")); //$NON-NLS-1$
 		gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
 		gd.horizontalSpan = 2;
 		label.setLayoutData(gd);
@@ -125,7 +125,7 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
 	 */
 	public String getName() {
-		return ExternalDebugUIMessages.getString("SDMDebuggerPage.debuggname"); //$NON-NLS-1$
+		return Messages.getString("SDMDebuggerPage.debuggname"); //$NON-NLS-1$
 	}
 	
 	/* (non-Javadoc)
@@ -150,9 +150,9 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 	@Override
 	public boolean isValid(ILaunchConfiguration launchConfig) {
 		if (getFieldContent(fRMDebuggerPathText.getText()) == null) {
-			errMsg = ExternalDebugUIMessages.getString("SDMDebuggerPage.err1"); //$NON-NLS-1$
+			errMsg = Messages.getString("SDMDebuggerPage.err1"); //$NON-NLS-1$
 		} else if (getFieldContent(fRMDebuggerAddressText.getText()) == null) {
-			errMsg = ExternalDebugUIMessages.getString("SDMDebuggerPage.err3"); //$NON-NLS-1$
+			errMsg = Messages.getString("SDMDebuggerPage.err3"); //$NON-NLS-1$
 		} else {
 			errMsg = null;
 		}
@@ -182,8 +182,8 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 		/*
 		 * We have just selected SDM as the debugger...
 		 */
-		IPreferenceStore store = PTPDebugUIPlugin.getDefault().getPreferenceStore();
-		String path = store.getString(IPDebugConstants.PREF_PTP_DEBUGGER_FILE);
+		Preferences store = SDMDebugCorePlugin.getDefault().getPluginPreferences();
+		String path = store.getString(SDMPreferenceConstants.SDM_DEBUGGER_FILE);
 		/*
 		 * Guess that the sdm executable is in the same location as the proxy. If not then use the
 		 * preference setting.
@@ -217,7 +217,7 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 			IRemoteFileManager fileManager = remoteServices.getFileManager(connection);
 			if (fileManager != null) {
 				IPath path = fileManager.browseFile(getShell(), 
-						ExternalDebugUIMessages.getString("SDMDebuggerPage.selectDebuggerExe"), 
+						Messages.getString("SDMDebuggerPage.selectDebuggerExe"), 
 						fRMDebuggerPathText.getText()); //$NON-NLS-1$
 				if (path != null) {
 					return path.toString();
@@ -225,7 +225,7 @@ public class SDMPage extends AbstractLaunchConfigurationTab {
 			}
 		} else {
 			FileDialog dialog = new FileDialog(getShell());
-			dialog.setText(ExternalDebugUIMessages.getString("SDMDebuggerPage.selectDebuggerExe"));
+			dialog.setText(Messages.getString("SDMDebuggerPage.selectDebuggerExe"));
 			dialog.setFileName(fRMDebuggerPathText.getText());
 			return dialog.open();
 		}
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/preferences/PreferenceMessages.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.java
index 5dea76ebd..95a550e1b 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/preferences/PreferenceMessages.java
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.java
@@ -16,7 +16,7 @@
  * 
  * LA-CC 04-115
  *******************************************************************************/
-package org.eclipse.ptp.debug.external.internal.ui.preferences;
+package org.eclipse.ptp.debug.sdm.internal.ui.preferences;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -26,7 +26,7 @@ import java.util.ResourceBundle;
  *
  */
 public class PreferenceMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.external.internal.ui.preferences.PreferenceMessages";
+	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.sdm.internal.ui.preferences.PreferenceMessages";
 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
 
 	private PreferenceMessages() {}
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/preferences/PreferenceMessages.properties b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.properties
index 465b1175f..465b1175f 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/preferences/PreferenceMessages.properties
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.properties
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/preferences/SDMPreferencePage.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/SDMPreferencePage.java
index 925ff19b2..01e771b84 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/internal/ui/preferences/SDMPreferencePage.java
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/SDMPreferencePage.java
@@ -16,14 +16,15 @@
  * 
  * LA-CC 04-115
  *******************************************************************************/
-package org.eclipse.ptp.debug.external.internal.ui.preferences;
+package org.eclipse.ptp.debug.sdm.internal.ui.preferences;
 
 import java.io.File;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
+import org.eclipse.ptp.debug.sdm.core.SDMDebugCorePlugin;
+import org.eclipse.ptp.debug.sdm.core.SDMPreferenceConstants;
+import org.eclipse.ptp.debug.ui.PreferencesAdapter;
 import org.eclipse.ptp.ui.preferences.AbstractPerferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -45,33 +46,103 @@ import org.eclipse.swt.widgets.Text;
  *
  */
 public class SDMPreferencePage extends AbstractPerferencePage {
-	private Text sdmPathText = null;
-	private Text sdmHostText = null;
-	private Text sdmBackendPathText = null;
-	private Text sdmArgsText = null;
-	private Combo sdmBackendCombo = null;
-	private Button sdmPathButton = null;
-	
-    protected class WidgetListener extends SelectionAdapter implements ModifyListener {
-   		public void widgetSelected(SelectionEvent e) {
+	protected class WidgetListener extends SelectionAdapter implements ModifyListener {
+   		public void modifyText(ModifyEvent e) {
+	    		setValid(isValid());        	
+	    }
+	    public void widgetSelected(SelectionEvent e) {
    			Object source = e.getSource();
    			if (source == sdmPathButton)
    				handleSDMButtonSelected();
    			else if (source == sdmBackendCombo)
    				handleSDMComboSelected();
    		}
-	    public void modifyText(ModifyEvent e) {
-	    		setValid(isValid());        	
-	    }
     }
+	private Text sdmPathText = null;
+	private Text sdmHostText = null;
+	private Text sdmBackendPathText = null;
+	private Text sdmArgsText = null;
+	private Combo sdmBackendCombo = null;
+	
+    private Button sdmPathButton = null;
     protected WidgetListener listener = new WidgetListener();
     
 	public SDMPreferencePage() {
 		super();
-		setPreferenceStore(PTPDebugUIPlugin.getDefault().getPreferenceStore());
+		setPreferenceStore(new PreferencesAdapter(SDMDebugCorePlugin.getDefault().getPluginPreferences()));
 		setDescription(PreferenceMessages.getString("SDMPreferencePage.sdm_desc"));
 	}
 	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#isValid()
+	 */
+	public boolean isValid() {
+		setErrorMessage(null);
+		setMessage(null);
+		String name = sdmPathText.getText();
+		if (name == null) {
+			setErrorMessage(PreferenceMessages.getString("SDMPreferencePage.no_sdm"));
+			return false;
+		}
+		File sdmFile = new File(name);
+		if (!sdmFile.isFile()) {
+			setErrorMessage(PreferenceMessages.getString("SDMPreferencePage.Selection_must_be_file"));
+			return false;
+		}
+		return true;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+	 */
+	public void performDefaults() { 
+		IPreferenceStore store = getPreferenceStore();
+		sdmPathText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_FILE));
+		sdmArgsText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_ARGS));
+		sdmHostText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_HOST));
+		sdmBackendCombo.select(sdmBackendCombo.indexOf(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE)));
+		sdmBackendPathText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH));
+		super.performDefaults();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
+	 */
+	public boolean performOk() {
+		storeValues();
+		SDMDebugCorePlugin.getDefault().savePluginPreferences();
+		return true;
+	}
+	
+	/**
+	 * Handle property change event
+	 * 
+     * @param event
+     */
+    public void propertyChange(PropertyChangeEvent event) {
+    		setValid(isValid());
+    }	
+	
+	/**
+	 * Handle sdm path button selected
+	 */
+	private void handleSDMButtonSelected() {
+		FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
+		String filePath = dialog.open();
+		if (filePath != null) {
+			sdmPathText.setText(filePath);
+		}
+	}
+	
+    /**
+	 * Handle combo selection
+	 */
+	private void handleSDMComboSelected() {
+	}	
+    
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
+	 */
 	protected Control createContents(Composite parent) {
 		//TODO ignored help
 		//getWorkbench().getHelpSystem().setHelp(getControl(), IPDebugHelpContextIds.P_DEBUG_PREFERENCE_PAGE);
@@ -90,6 +161,10 @@ public class SDMPreferencePage extends AbstractPerferencePage {
 		setValues();
 		return composite;
 	}
+	
+	/**
+	 * @param parent
+	 */
 	protected void createSDMSetting(Composite parent) {
 		Composite group = createGroupComposite(parent, 1, false, PreferenceMessages.getString("SDMPreferencePage.sdm_group"));
 		Composite comp = createComposite(group, 3);
@@ -104,7 +179,7 @@ public class SDMPreferencePage extends AbstractPerferencePage {
 		new Label(comp, SWT.NONE).setText(PreferenceMessages.getString("SDMPreferencePage.sdm_backend"));
 		sdmBackendCombo = new Combo(comp, SWT.READ_ONLY);
 		sdmBackendCombo.setLayoutData(gd);
-		sdmBackendCombo.setItems(IPDebugConstants.DEBUGGER_BACKENDS);
+		sdmBackendCombo.setItems(SDMPreferenceConstants.SDM_DEBUGGER_BACKENDS);
 		sdmBackendCombo.addSelectionListener(listener);
 
 		new Label(comp, SWT.NONE).setText(PreferenceMessages.getString("SDMPreferencePage.sdm_backend_path"));
@@ -124,64 +199,28 @@ public class SDMPreferencePage extends AbstractPerferencePage {
 		sdmArgsText.setLayoutData(gd);
 		sdmArgsText.addModifyListener(listener);		
 	}
-	public void performDefaults() { 
-		IPreferenceStore store = getPreferenceStore();
-		sdmPathText.setText(store.getDefaultString(IPDebugConstants.PREF_PTP_DEBUGGER_FILE));
-		sdmArgsText.setText(store.getDefaultString(IPDebugConstants.PREF_PTP_DEBUGGER_ARGS));
-		sdmHostText.setText(store.getDefaultString(IPDebugConstants.PREF_PTP_DEBUGGER_HOST));
-		sdmBackendCombo.select(sdmBackendCombo.indexOf(store.getDefaultString(IPDebugConstants.PREF_PTP_DEBUGGER_BACKEND_TYPE)));
-		sdmBackendPathText.setText(store.getDefaultString(IPDebugConstants.PREF_PTP_DEBUGGER_BACKEND_PATH));
-		super.performDefaults();
-	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ptp.ui.preferences.AbstractPerferencePage#setValues()
+	 */
 	protected void setValues() {
 		IPreferenceStore store = getPreferenceStore();
-		sdmPathText.setText(store.getString(IPDebugConstants.PREF_PTP_DEBUGGER_FILE));
-		sdmArgsText.setText(store.getString(IPDebugConstants.PREF_PTP_DEBUGGER_ARGS));
-		sdmHostText.setText(store.getString(IPDebugConstants.PREF_PTP_DEBUGGER_HOST));
-		sdmBackendCombo.select(sdmBackendCombo.indexOf(store.getString(IPDebugConstants.PREF_PTP_DEBUGGER_BACKEND_TYPE)));
-		sdmBackendPathText.setText(store.getString(IPDebugConstants.PREF_PTP_DEBUGGER_BACKEND_PATH));
-	}	
-	protected void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		store.setValue(IPDebugConstants.PREF_PTP_DEBUGGER_FILE, sdmPathText.getText());
-		store.setValue(IPDebugConstants.PREF_PTP_DEBUGGER_ARGS, sdmArgsText.getText());
-		store.setValue(IPDebugConstants.PREF_PTP_DEBUGGER_HOST, sdmHostText.getText());
-		store.setValue(IPDebugConstants.PREF_PTP_DEBUGGER_BACKEND_TYPE, sdmBackendCombo.getItem(sdmBackendCombo.getSelectionIndex()));
-		store.setValue(IPDebugConstants.PREF_PTP_DEBUGGER_BACKEND_PATH, sdmBackendPathText.getText());
+		sdmPathText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_FILE));
+		sdmArgsText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_ARGS));
+		sdmHostText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_HOST));
+		sdmBackendCombo.select(sdmBackendCombo.indexOf(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE)));
+		sdmBackendPathText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH));
 	}
 	
-    public void propertyChange(PropertyChangeEvent event) {
-    		setValid(isValid());
-    }	
-	public boolean performOk() {
-		storeValues();
-		PTPDebugUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}			
-	public boolean isValid() {
-		setErrorMessage(null);
-		setMessage(null);
-		String name = sdmPathText.getText();
-		if (name == null) {
-			setErrorMessage(PreferenceMessages.getString("SDMPreferencePage.no_sdm"));
-			return false;
-		}
-		File sdmFile = new File(name);
-		if (!sdmFile.isFile()) {
-			setErrorMessage(PreferenceMessages.getString("SDMPreferencePage.Selection_must_be_file"));
-			return false;
-		}
-		return true;
-	}
-	
-	private void handleSDMButtonSelected() {
-		FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-		String filePath = dialog.open();
-		if (filePath != null) {
-			sdmPathText.setText(filePath);
-		}
-	}
-	
-	private void handleSDMComboSelected() {
+	/* (non-Javadoc)
+	 * @see org.eclipse.ptp.ui.preferences.AbstractPerferencePage#storeValues()
+	 */
+	protected void storeValues() {
+		IPreferenceStore store = getPreferenceStore();
+		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_FILE, sdmPathText.getText());
+		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_ARGS, sdmArgsText.getText());
+		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_HOST, sdmHostText.getText());
+		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE, sdmBackendCombo.getItem(sdmBackendCombo.getSelectionIndex()));
+		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH, sdmBackendPathText.getText());
 	}
 }
diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/ui/ExternalUIPlugin.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/ui/SDMDebugUIPlugin.java
index c31392b14..a7399e2aa 100644
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/external/ui/ExternalUIPlugin.java
+++ b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/ui/SDMDebugUIPlugin.java
@@ -1,4 +1,4 @@
-package org.eclipse.ptp.debug.external.ui;
+package org.eclipse.ptp.debug.sdm.ui;
 
 import org.eclipse.ui.plugin.*;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -7,15 +7,15 @@ import org.osgi.framework.BundleContext;
 /**
  * The main plugin class to be used in the desktop.
  */
-public class ExternalUIPlugin extends AbstractUIPlugin {
+public class SDMDebugUIPlugin extends AbstractUIPlugin {
 
 	//The shared instance.
-	private static ExternalUIPlugin plugin;
+	private static SDMDebugUIPlugin plugin;
 	
 	/**
 	 * The constructor.
 	 */
-	public ExternalUIPlugin() {
+	public SDMDebugUIPlugin() {
 		plugin = this;
 	}
 
@@ -37,7 +37,7 @@ public class ExternalUIPlugin extends AbstractUIPlugin {
 	/**
 	 * Returns the shared instance.
 	 */
-	public static ExternalUIPlugin getDefault() {
+	public static SDMDebugUIPlugin getDefault() {
 		return plugin;
 	}
 
@@ -49,6 +49,6 @@ public class ExternalUIPlugin extends AbstractUIPlugin {
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.debug.external.ui", path);
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.debug.sdm.ui", path);
 	}
 }