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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 2fb9c29..48b2835 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -20,6 +20,7 @@ import net.sourceforge.phpeclipse.resourcesview.PHPElement;
 import net.sourceforge.phpeclipse.resourcesview.PHPElementAdapterFactory;
 import net.sourceforge.phpeclipse.resourcesview.ResourceAdapterFactory;
 
+import org.eclipse.core.boot.BootLoader;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -41,7 +42,9 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 /**
  * The main plugin class to be used in the desktop.
  */
-public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceConstants {
+public class PHPeclipsePlugin
+  extends AbstractUIPlugin
+  implements IPreferenceConstants {
   //	public static final String LOCALHOST_PREF = "_localhost";
   //	public static final String DOCUMENTROOT_PREF = "_documentroot";
   //	public static final String USE_EXTERNAL_BROWSER_PREF = "_use_external_browser";
@@ -58,7 +61,15 @@ 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";
-  public static final String PHP_RESOURCES_VIEW_ID = PLUGIN_ID + ".resourcesview.ViewPHPResources"; //$NON-NLS-1$
+  // 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$
+
+  public static final String PHPPARSER_NEW = "test.PHPParser";
+  public static final String PHPPARSER_ORIGINAL =
+    "net.sourceforge.phpdt.internal.compiler.parser.Parser";
+
+  /** Change this if you want to switch PHP Parser. */
+  public static final String PHPPARSER = PHPPARSER_ORIGINAL;
 
   //The shared instance.
   private static PHPeclipsePlugin plugin;
@@ -68,7 +79,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   private ImageDescriptorRegistry fImageDescriptorRegistry;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
   /**
-  * The Java virtual machine that we are running on.  
+  * The Java virtual machine that we are running on.
   */
   private static int jvm;
 
@@ -92,6 +103,9 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
 
   /** JVM constant for any other platform */
   private static final int OTHER = -1;
+  
+  /** General debug flag*/
+  public static final boolean DEBUG = false;
   /**
    * The constructor.
    */
@@ -122,7 +136,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     return fCompilationUnitDocumentProvider;
   }
 
-  public static void setJVM() {
+  private static void setJVM() {
     String osName = System.getProperty("os.name");
 
     if (osName.startsWith("Mac OS")) {
@@ -199,13 +213,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   //  public static void logErrorStatus(String message, IStatus status) {
   //    if (status == null) {
   //      logErrorMessage(message);
-  //      return; 
+  //      return;
   //    }
   //    MultiStatus multi= new MultiStatus(getPluginId(), JavaStatusConstants.INTERNAL_ERROR, message, null);
   //    multi.add(status);
   //    log(multi);
   //  }
-  //  
+  //
   //  public static void log(Throwable e) {
   //    log(new Status(IStatus.ERROR, getPluginId(), JavaStatusConstants.INTERNAL_ERROR, JavaUIMessages.getString("JavaPlugin.internal_error"), e)); //$NON-NLS-1$
   //  }
@@ -217,6 +231,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   public static void log(Throwable e) {
     log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "PHPeclipsePlugin.internalErrorOccurred", e)); //$NON-NLS-1$
   }
+  
   public static boolean isDebug() {
     return getDefault().isDebugging();
   }
@@ -251,24 +266,42 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
 
     store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false");
     store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
+
+    String windowsSystem = BootLoader.getWS();
+
     if (jvm == WINDOWS_9x) {
-      store.setDefault(EXTERNAL_BROWSER_PREF, "command.com /c start iexplore {0}");
-    } else if (jvm == WINDOWS_NT) {
-      store.setDefault(EXTERNAL_BROWSER_PREF, "rundll32 url.dll,FileProtocolHandler {0}");
+      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 {
       store.setDefault(EXTERNAL_BROWSER_PREF, "netscape {0}");
     }
-    store.setDefault(DOCUMENTROOT_PREF, getWorkspace().getRoot().getLocation().toString());
-    if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
+    store.setDefault(
+      DOCUMENTROOT_PREF,
+      getWorkspace().getRoot().getLocation().toString());
+    //  if ((jvm == WINDOWS_9x) || (jvm == WINDOWS_NT)) {
+    if (windowsSystem.equals(BootLoader.WS_WIN32)) {
       store.setDefault(EXTERNAL_PARSER_PREF, "c:\\apache\\php\\php -l -f {0}");
-      store.setDefault(MYSQL_PREF, "c:\\apache\\mysql\\bin\\mysqld.exe --standalone");
-      store.setDefault(APACHE_START_PREF, "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\"");
+      store.setDefault(
+        MYSQL_PREF,
+        "c:\\apache\\mysql\\bin\\mysqld.exe --standalone");
+      store.setDefault(
+        APACHE_START_PREF,
+        "c:\\apache\\apache.exe -c \"DocumentRoot \"{0}\"\"");
       store.setDefault(APACHE_STOP_PREF, "c:\\apache\\apache.exe -k shutdown");
-      store.setDefault(APACHE_RESTART_PREF, "c:\\apache\\apache.exe -k restart");
+      store.setDefault(
+        APACHE_RESTART_PREF,
+        "c:\\apache\\apache.exe -k restart");
     } else {
       store.setDefault(EXTERNAL_PARSER_PREF, "/apache/php/php -l -f {0}");
       store.setDefault(MYSQL_PREF, "/apache/mysql/bin/mysqld --standalone");
-      store.setDefault(APACHE_START_PREF, "/apache/apache -c \"DocumentRoot \"{0}\"\"");
+      store.setDefault(
+        APACHE_START_PREF,
+        "/apache/apache -c \"DocumentRoot \"{0}\"\"");
       store.setDefault(APACHE_STOP_PREF, "/apache/apache.exe -k shutdown");
       store.setDefault(APACHE_RESTART_PREF, "/apache/apache -k restart");
 
@@ -287,21 +320,54 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     // php syntax highlighting
     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);
-    PreferenceConverter.setDefault(store, PHP_KEYWORD, PHPColorProvider.KEYWORD);
-    PreferenceConverter.setDefault(store, PHP_VARIABLE, PHPColorProvider.VARIABLE);
-    PreferenceConverter.setDefault(store, PHP_FUNCTIONNAME, PHPColorProvider.FUNCTION_NAME);
-    PreferenceConverter.setDefault(store, PHP_CONSTANT, PHPColorProvider.CONSTANT);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_MULTILINE_COMMENT,
+      PHPColorProvider.MULTI_LINE_COMMENT);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_SINGLELINE_COMMENT,
+      PHPColorProvider.SINGLE_LINE_COMMENT);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_KEYWORD,
+      PHPColorProvider.KEYWORD);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_VARIABLE,
+      PHPColorProvider.VARIABLE);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_FUNCTIONNAME,
+      PHPColorProvider.FUNCTION_NAME);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_CONSTANT,
+      PHPColorProvider.CONSTANT);
     PreferenceConverter.setDefault(store, PHP_TYPE, PHPColorProvider.TYPE);
     PreferenceConverter.setDefault(store, PHP_STRING, PHPColorProvider.STRING);
-    PreferenceConverter.setDefault(store, PHP_DEFAULT, PHPColorProvider.DEFAULT);
-    PreferenceConverter.setDefault(store, PHP_EDITOR_BACKGROUND, PHPColorProvider.BACKGROUND);
-    PreferenceConverter.setDefault(store, LINKED_POSITION_COLOR, PHPColorProvider.LINKED_POSITION_COLOR);
-    PreferenceConverter.setDefault(store, LINE_NUMBER_COLOR, PHPColorProvider.LINE_NUMBER_COLOR);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_DEFAULT,
+      PHPColorProvider.DEFAULT);
+    PreferenceConverter.setDefault(
+      store,
+      PHP_EDITOR_BACKGROUND,
+      PHPColorProvider.BACKGROUND);
+    PreferenceConverter.setDefault(
+      store,
+      LINKED_POSITION_COLOR,
+      PHPColorProvider.LINKED_POSITION_COLOR);
+    PreferenceConverter.setDefault(
+      store,
+      LINE_NUMBER_COLOR,
+      PHPColorProvider.LINE_NUMBER_COLOR);
 
     store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
-    PreferenceConverter.setDefault(store, PREFERENCE_COLOR_BACKGROUND, PHPColorProvider.BACKGROUND_COLOR);
+    PreferenceConverter.setDefault(
+      store,
+      PREFERENCE_COLOR_BACKGROUND,
+      PHPColorProvider.BACKGROUND_COLOR);
 
     //language stuff
     store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT);
@@ -312,10 +378,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
 
     store.setDefault(PHP_OUTLINE_CLASS, "true"); //$NON-NLS-1$
     store.setDefault(PHP_OUTLINE_FUNC, "true"); //$NON-NLS-1$
-    store.setDefault(PHP_OUTLINE_VAR, "true"); //$NON-NLS-1$ 
+    store.setDefault(PHP_OUTLINE_VAR, "true"); //$NON-NLS-1$
 
     TemplatePreferencePage.initDefaults(store);
-    new PHPSyntaxRdr(); //this will initialize the static fields in the syntaxrdr class
+    //this will initialize the static fields in the syntaxrdr class
+    new PHPSyntaxRdr();
+
+    PHPCore.initializeDefaultPluginPreferences();
   }
 
   public void startup() throws CoreException {