X-Git-Url: http://git.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 0cb4ae8..99c2a80 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -13,11 +13,16 @@ package net.sourceforge.phpeclipse;
 
 import net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage;
 import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
+import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider;
+import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
+import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 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;
@@ -36,13 +41,12 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
-import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
-import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
-
 /**
  * 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";
@@ -59,7 +63,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,8 +80,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
 
   private ImageDescriptorRegistry fImageDescriptorRegistry;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
+  
+  private JavaTextTools fJavaTextTools;
+  
   /**
-  * The Java virtual machine that we are running on.  
+  * The Java virtual machine that we are running on.
   */
   private static int jvm;
 
@@ -93,6 +108,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.
    */
@@ -117,13 +135,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     return fImageDescriptorRegistry;
   }
   // @TODO: refactor this into a better method name !
-  public PHPDocumentProvider getCompilationUnitDocumentProvider() {
+  public synchronized PHPDocumentProvider getCompilationUnitDocumentProvider() {
     if (fCompilationUnitDocumentProvider == null)
-      fCompilationUnitDocumentProvider = new PHPDocumentProvider();
+      fCompilationUnitDocumentProvider= new PHPDocumentProvider();
     return fCompilationUnitDocumentProvider;
   }
-
-  public static void setJVM() {
+  
+  private static void setJVM() {
     String osName = System.getProperty("os.name");
 
     if (osName.startsWith("Mac OS")) {
@@ -200,13 +218,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$
   //  }
@@ -218,6 +236,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();
   }
@@ -225,7 +244,13 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
   static IPath getInstallLocation() {
     return new Path(getDefault().getDescriptor().getInstallURL().getFile());
   }
-
+  
+  public synchronized JavaTextTools getJavaTextTools() {
+    if (fJavaTextTools == null)
+      fJavaTextTools= new JavaTextTools(getPreferenceStore());
+    return fJavaTextTools;
+  }
+  
   /**
    * Returns the string from the plugin's resource bundle,
    * or 'key' if not found.
@@ -252,24 +277,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");
 
@@ -282,40 +325,96 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
     store.setDefault(PHP_PARSE_ON_SAVE, "true");
 
     // show line numbers:
-    store.setDefault(LINE_NUMBER_RULER, "false");
+ //   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
 
-    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);
-
-    store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
-    PreferenceConverter.setDefault(store, PREFERENCE_COLOR_BACKGROUND, PHPColorProvider.BACKGROUND_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);
+
+//    // set default PHPDoc colors:
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_KEYWORD, 
+//      PHPColorProvider.PHPDOC_KEYWORD);
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_LINK, 
+//      PHPColorProvider.PHPDOC_LINK);      
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_DEFAULT, 
+//      PHPColorProvider.PHPDOC_DEFAULT);
+//    PreferenceConverter.setDefault(
+//      store,
+//      PHPDOC_TAG, 
+//      PHPColorProvider.PHPDOC_TAG);
+      
+//    store.setDefault(PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT, "true");
+//    PreferenceConverter.setDefault(
+//      store,
+//      PREFERENCE_COLOR_BACKGROUND,
+//      PHPColorProvider.BACKGROUND_COLOR);
 
     //language stuff
     store.setDefault(RESOURCE_BUNDLE, LANGUAGE_DEFAULT);
     store.setDefault(RESOURCE_BUNDLE_EN_GB, "true");
     store.setDefault(RESOURCE_BUNDLE_DE, "false");
     store.setDefault(RESOURCE_BUNDLE_FR, "false");
+    store.setDefault(RESOURCE_BUNDLE_ES, "false");
 
     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();
+    PreferenceConstants.initializeDefaultValues(store);
   }
 
   public void startup() throws CoreException {