fixed problem with TokenNameDOLLAR_LBRACE token in outlineinfo

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPEclipseBasePreferencePage.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java
index 8df6345..000a10e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPEclipseBasePreferencePage.java
@@ -35,12 +35,14 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
 
   StringFieldEditor localHostSFE;
   DirectoryFieldEditor documentRootDFE;
+  BooleanFieldEditor showExternalPreviewBFE;
   BooleanFieldEditor externalBrowserBFE;
   StringFieldEditor externalBrowserSFE;
   StringFieldEditor apacheStartSFE;
   StringFieldEditor apacheStopSFE;
   StringFieldEditor apacheRestartSFE;
   StringFieldEditor mySQLCommandSFE;
+  StringFieldEditor phpRunSFE;
   RadioGroupFieldEditor chooseParser;
   StringFieldEditor externalParserSFE;
   BooleanFieldEditor parseOnSave;
@@ -55,12 +57,14 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
   protected void performDefaults() {
     localHostSFE.loadDefault();
     documentRootDFE.loadDefault();
+    showExternalPreviewBFE.loadDefault();
     externalBrowserBFE.loadDefault();
     externalBrowserSFE.loadDefault();
     apacheStartSFE.loadDefault();
     apacheStopSFE.loadDefault();
     apacheRestartSFE.loadDefault();
     mySQLCommandSFE.loadDefault();
+    phpRunSFE.loadDefault();
     chooseParser.loadDefault();
     externalParserSFE.loadDefault();
     parseOnSave.loadDefault();
@@ -70,12 +74,14 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
   public boolean performOk() {
     localHostSFE.store();
     documentRootDFE.store();
+    showExternalPreviewBFE.store();
     externalBrowserBFE.store();
     externalBrowserSFE.store();
     apacheStartSFE.store();
     apacheStopSFE.store();
     apacheRestartSFE.store();
     mySQLCommandSFE.store();
+    phpRunSFE.store();
     chooseParser.store();
     externalParserSFE.store();
     parseOnSave.store();
@@ -95,7 +101,7 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
     Group webSettingsGroup = new Group(webSettingsComposite, SWT.NONE);
     webSettingsGroup.setText(PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup"));
     webSettingsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-       webSettingsGroup.setLayout(new GridLayout());
+    webSettingsGroup.setLayout(new GridLayout());
     localHostSFE =
       new StringFieldEditor(
         IPreferenceConstants.LOCALHOST_PREF,
@@ -112,7 +118,17 @@ public class PHPEclipseBasePreferencePage extends PreferencePage implements IWor
     documentRootDFE.setPreferencePage(this);
     documentRootDFE.setPreferenceStore(getPreferenceStore());
     documentRootDFE.load();
-new Label(webSettingsGroup, SWT.NONE);
+    
+    new Label(webSettingsGroup, SWT.NONE);
+    showExternalPreviewBFE =
+      new BooleanFieldEditor(
+        IPreferenceConstants.SHOW_EXTERNAL_PREVIEW_PREF,
+        PHPPreferencesMessages.getString("PHPBasePreferencePage.websettingsGroup.showexternalpreview"),
+        webSettingsGroup);
+    showExternalPreviewBFE.setPreferencePage(this);
+    showExternalPreviewBFE.setPreferenceStore(getPreferenceStore());
+    showExternalPreviewBFE.load();
+    new Label(webSettingsGroup, SWT.NONE);
     externalBrowserBFE =
       new BooleanFieldEditor(
         IPreferenceConstants.USE_EXTERNAL_BROWSER_PREF,
@@ -121,7 +137,7 @@ new Label(webSettingsGroup, SWT.NONE);
     externalBrowserBFE.setPreferencePage(this);
     externalBrowserBFE.setPreferenceStore(getPreferenceStore());
     externalBrowserBFE.load();
-new Label(webSettingsGroup, SWT.NONE);
+    new Label(webSettingsGroup, SWT.NONE);
     externalBrowserSFE =
       new StringFieldEditor(
         IPreferenceConstants.EXTERNAL_BROWSER_PREF,
@@ -163,6 +179,15 @@ new Label(webSettingsGroup, SWT.NONE);
     apacheRestartSFE.setPreferencePage(this);
     apacheRestartSFE.setPreferenceStore(getPreferenceStore());
     apacheRestartSFE.load();
+    
+    phpRunSFE =
+      new StringFieldEditor(
+        IPreferenceConstants.PHP_RUN_PREF,
+        PHPPreferencesMessages.getString("PHPBasePreferencePage.console.php"),
+        apacheSettingsGroup);
+    phpRunSFE.setPreferencePage(this);
+    phpRunSFE.setPreferenceStore(getPreferenceStore());
+    phpRunSFE.load();
 
     //Create mySQL
     Composite mySQLSettingsComposite = new Composite(composite, SWT.NULL);
@@ -204,19 +229,24 @@ new Label(webSettingsGroup, SWT.NONE);
     chooseParser.setPreferencePage(this);
     chooseParser.setPreferenceStore(getPreferenceStore());
     chooseParser.load();
-       //create a copmposte just for the StringEditor - makes layout simpler
-       Composite externalParserCompo = new Composite(parserSettingsGroup, SWT.NONE);
-       externalParserSFE =
-                new StringFieldEditor(
-                  IPreferenceConstants.EXTERNAL_PARSER_PREF,
-                  PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.extcommand"),
-                       externalParserCompo/*parserSettingsGroup*/);
-       externalParserSFE.setPreferencePage(this);
-       externalParserSFE.setPreferenceStore(getPreferenceStore());
-       externalParserSFE.load();
-
-    parseOnSave = new BooleanFieldEditor(PHPeclipsePlugin.PHP_PARSE_ON_SAVE, 
-               PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.pos"), parserSettingsGroup);
+    //create a copmposte just for the StringEditor - makes layout simpler
+    Composite externalParserCompo = new Composite(parserSettingsGroup, SWT.NONE);
+    externalParserSFE =
+      new StringFieldEditor(
+        IPreferenceConstants.EXTERNAL_PARSER_PREF,
+        PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.extcommand"),
+        externalParserCompo
+    /*parserSettingsGroup*/
+    );
+    externalParserSFE.setPreferencePage(this);
+    externalParserSFE.setPreferenceStore(getPreferenceStore());
+    externalParserSFE.load();
+
+    parseOnSave =
+      new BooleanFieldEditor(
+        PHPeclipsePlugin.PHP_PARSE_ON_SAVE,
+        PHPPreferencesMessages.getString("PHPBasePreferencePage.parsers.pos"),
+        parserSettingsGroup);
     parseOnSave.setPreferencePage(this);
     parseOnSave.setPreferenceStore(getPreferenceStore());
     parseOnSave.load();