1) Reintroduced some out commented methods. (Did break some preference settings)

[phpeclipse.git] / net.sourceforge.phpeclipse.externaltools / src / net / sourceforge / phpdt / externaltools / preferences / XamppPrefencePage.java

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/XamppPrefencePage.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/XamppPrefencePage.java
index a6c001f..9968de1 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/XamppPrefencePage.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/XamppPrefencePage.java
@@ -1,8 +1,10 @@
 package net.sourceforge.phpdt.externaltools.preferences;
 
 import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin;
+// import net.sourceforge.phpeclipse.xdebug.core.XDebugCorePlugin;
 
 import org.eclipse.jface.preference.FileFieldEditor;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -21,8 +23,10 @@ public class XamppPrefencePage extends PreferencePage implements
 
        public XamppPrefencePage() {
                super();
-               setPreferenceStore(ExternalToolsPlugin.getDefault()
-                               .getPreferenceStore());
+               
+        if (ExternalToolsPlugin.getDefault () != null) {
+            setPreferenceStore (ExternalToolsPlugin.getDefault().getPreferenceStore());
+        }
        }
 
        protected Control createContents(Composite parent) {
@@ -44,7 +48,7 @@ public class XamppPrefencePage extends PreferencePage implements
                                ExternalToolsPlugin.XAMPP_STOP_PREF,
                                PHPPreferencesMessages
                                                .getString("PHPBasePreferencePage.apacheGroup.xampp_stop"),
-                                               composite);
+                               composite);
                xamppStopSFE.setPage(this);
                xamppStopSFE.setPreferenceStore(getPreferenceStore());
                xamppStopSFE.load();