1) Fixed issue #714: PHP Parser bug with $this->oR.

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

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java
index f730439..e35c2d1 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/preferences/PHPExternalToolsPreferencePage.java
@@ -23,8 +23,10 @@ public class PHPExternalToolsPreferencePage extends PreferencePage implements
 
        public PHPExternalToolsPreferencePage() {
                super();
-               setPreferenceStore(ExternalToolsPlugin.getDefault()
-                               .getPreferenceStore());
+               
+        if (ExternalToolsPlugin.getDefault () != null) {
+            setPreferenceStore (ExternalToolsPlugin.getDefault().getPreferenceStore());
+        }
        }
 
        public void init(IWorkbench workbench) {
@@ -65,7 +67,7 @@ public class PHPExternalToolsPreferencePage extends PreferencePage implements
                externalParserSFE.load();
                new Label(composite, SWT.NONE);
 
-               composite.setLayout(new GridLayout(3,false));
+               composite.setLayout(new GridLayout(3, false));
                return composite;
        }
 }
\ No newline at end of file