Some bugs fixed

[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..51a215a 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -65,11 +65,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;
@@ -103,7 +103,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 +231,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();
   }
@@ -339,7 +339,7 @@ public class PHPeclipsePlugin
     PreferenceConverter.setDefault(
       store,
       PHP_FUNCTIONNAME,
-      PHPColorProvider.FUNCTION_NAME);
+      PHPColorProvider.FUNCTION_NAME); 
     PreferenceConverter.setDefault(
       store,
       PHP_CONSTANT,
@@ -363,6 +363,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,