Fixed bug passing default partition type to scanner when entering

[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 d296c9b..9384fc1 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -13,6 +13,8 @@ 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;
@@ -65,11 +67,11 @@ public class PHPeclipsePlugin
   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 =
+  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_NEW;
+  /** Change this if you want to switch PHP Parser. */
+  public static final String PHPPARSER = PHPPARSER_ORIGINAL;
 
   //The shared instance.
   private static PHPeclipsePlugin plugin;
@@ -78,6 +80,9 @@ public class PHPeclipsePlugin
 
   private ImageDescriptorRegistry fImageDescriptorRegistry;
   private PHPDocumentProvider fCompilationUnitDocumentProvider;
+  
+  private JavaTextTools fJavaTextTools;
+  
   /**
   * The Java virtual machine that we are running on.
   */
@@ -103,7 +108,7 @@ public class PHPeclipsePlugin
 
   /** JVM constant for any other platform */
   private static final int OTHER = -1;
-  
+
   /** General debug flag*/
   public static final boolean DEBUG = false;
   /**
@@ -231,7 +236,7 @@ public class PHPeclipsePlugin
   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();
   }
@@ -239,7 +244,13 @@ public class PHPeclipsePlugin
   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.
@@ -339,7 +350,7 @@ public class PHPeclipsePlugin
     PreferenceConverter.setDefault(
       store,
       PHP_FUNCTIONNAME,
-      PHPColorProvider.FUNCTION_NAME);
+      PHPColorProvider.FUNCTION_NAME); 
     PreferenceConverter.setDefault(
       store,
       PHP_CONSTANT,
@@ -363,6 +374,24 @@ public class PHPeclipsePlugin
       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,
@@ -385,6 +414,7 @@ public class PHPeclipsePlugin
     new PHPSyntaxRdr();
 
     PHPCore.initializeDefaultPluginPreferences();
+    PreferenceConstants.initializeDefaultValues(store);
   }
 
   public void startup() throws CoreException {