X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/preference/XDebugPreferencePage.java b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/preference/XDebugPreferencePage.java
index 58580b8..2aa0b32 100644
--- a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/preference/XDebugPreferencePage.java
+++ b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/preference/XDebugPreferencePage.java
@@ -17,6 +17,8 @@ public class XDebugPreferencePage extends FieldEditorPreferencePage implements
 
 	/* Preference page for the default XDebug-Settings */
 	
+	private IntegerFieldEditor debugPort;
+
 	public XDebugPreferencePage() {
 		super(FieldEditorPreferencePage.GRID);
 
@@ -24,9 +26,12 @@ public class XDebugPreferencePage extends FieldEditorPreferencePage implements
 		IPreferenceStore store =
 			XDebugCorePlugin.getDefault().getPreferenceStore();
 		store.setDefault(IXDebugPreferenceConstants.DEBUGPORT_PREFERENCE,IXDebugPreferenceConstants.DEFAULT_DEBUGPORT);
-		// get the default form the externalToolsPlugin 
-		String interpreter=ExternalToolsPlugin.getDefault().getPreferenceStore().getString(ExternalToolsPlugin.PHP_RUN_PREF);
-		store.setDefault(IXDebugPreferenceConstants.PHP_INTERPRETER_PREFERENCE,interpreter);
+		// get the default from the externalToolsPlugin
+		
+		if (ExternalToolsPlugin.getDefault () != null) {
+		    String interpreter = ExternalToolsPlugin.getDefault ().getPreferenceStore().getString(ExternalToolsPlugin.PHP_RUN_PREF);
+	        store.setDefault(IXDebugPreferenceConstants.PHP_INTERPRETER_PREFERENCE,interpreter);
+		}
 		setPreferenceStore(store);
 	}
 
@@ -35,8 +40,9 @@ public class XDebugPreferencePage extends FieldEditorPreferencePage implements
 	}
 
 	protected void createFieldEditors() {
-		IntegerFieldEditor debugPort = new IntegerFieldEditor(IXDebugPreferenceConstants.DEBUGPORT_PREFERENCE, "&Debugport:", getFieldEditorParent(),5);
+		debugPort = new IntegerFieldEditor(IXDebugPreferenceConstants.DEBUGPORT_PREFERENCE, "&Debugport:", getFieldEditorParent(),5);
 		debugPort.setValidRange(1025,65535);
+		
 		debugPort.setErrorMessage("Debugport must be between 1024 and 65536");
 		addField(debugPort);
 		
@@ -45,6 +51,11 @@ public class XDebugPreferencePage extends FieldEditorPreferencePage implements
 		addField(phpInterpreter);
 		
 	}
+	
+	public void performApply() {
+		super.performApply();
+		//XDebugCorePlugin.getDefault().setProxyPort(debugPort.getIntValue());
+	}