a little bugfix in the variable parsing

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 7f027b7..cb16be2 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -56,6 +56,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
    */
   public static final String PLUGIN_ID = "net.sourceforge.phpeclipse"; //$NON-NLS-1$
   public final static String PHP_NATURE_ID = PLUGIN_ID + ".phpnature";
+
+  /** 
+   * id of builder - matches plugin.xml (concatenate pluginid.builderid) 
+   */
+  public static final String BUILDER_INDEX_ID = PLUGIN_ID + ".indexbuilder";
+  public static final String BUILDER_PARSER_ID = PLUGIN_ID + ".parserbuilder";
+
   // public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID + ".resourcesview.ViewPHPResources"; //$NON-NLS-1$
   public static final String PHP_CODING_ACTION_SET_ID = PLUGIN_ID + ".ui.CodingActionSet"; //$NON-NLS-1$
 
@@ -291,6 +298,9 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       store.setDefault(EXTERNAL_BROWSER_PREF, "command.com /c start iexplore {0}");
     } else if (windowsSystem.equals(BootLoader.WS_WIN32)) {
       store.setDefault(EXTERNAL_BROWSER_PREF, "rundll32 url.dll,FileProtocolHandler {0}");
+    } else if (windowsSystem.equals(BootLoader.WS_CARBON)) {
+       // TODO How do we start Safari on Mac OS X ?
+      store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
     } else {
       store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
     }
@@ -304,10 +314,12 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
       store.setDefault(MYSQL_RUN_PREF, "c:\\apache\\mysql\\bin\\mysqld-nt.exe");
       store.setDefault(APACHE_RUN_PREF, "c:\\apache\\apache.exe");
     } else {
+
       store.setDefault(PHP_RUN_PREF, "/apache/php/php");
       store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
       store.setDefault(MYSQL_RUN_PREF, "/apache/mysql/bin/mysqld");
       store.setDefault(APACHE_RUN_PREF, "/apache/apache");
+
     }
     store.setDefault(MYSQL_PREF, "--standalone");
     store.setDefault(APACHE_START_PREF, "-c \"DocumentRoot \"{0}\"\"");
@@ -323,14 +335,15 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     store.setDefault(PHP_INTERNAL_PARSER, "false");
     store.setDefault(PHP_EXTERNAL_PARSER, "true");
 
-    store.setDefault(PHP_PARSE_ON_SAVE, "true");
+    //    store.setDefault(PHP_PARSE_ON_SAVE, "true");
 
     // show line numbers:
     //   store.setDefault(LINE_NUMBER_RULER, "false");
     //    store.setDefault(FORMATTER_TAB_SIZE, "4");
 
     // php syntax highlighting
-    store.setDefault(PHP_USERDEF_XMLFILE, ""); //assume there is none  chooA
+    store.setDefault(PHP_USERDEF_XMLFILE, "");
+    //assume there is none  chooA
 
     PreferenceConverter.setDefault(store, PHP_MULTILINE_COMMENT, PHPColorProvider.MULTI_LINE_COMMENT);
     PreferenceConverter.setDefault(store, PHP_SINGLELINE_COMMENT, PHPColorProvider.SINGLE_LINE_COMMENT);