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 1b89cad..1f6f8f3 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -68,7 +68,7 @@ public class PHPeclipsePlugin
   public static final String PHPPARSER_ORIGINAL =
     "net.sourceforge.phpdt.internal.compiler.parser.Parser";
 
-  /** Change this if you want to switch PHP Parser) */
+  /** Change this if you want to switch PHP Parser. */
   public static final String PHPPARSER = PHPPARSER_ORIGINAL;
 
   //The shared instance.
@@ -103,6 +103,9 @@ public class PHPeclipsePlugin
 
   /** JVM constant for any other platform */
   private static final int OTHER = -1;
+
+  /** General debug flag*/
+  public static final boolean DEBUG = false;
   /**
    * The constructor.
    */
@@ -228,6 +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();
   }
@@ -335,7 +339,7 @@ public class PHPeclipsePlugin
     PreferenceConverter.setDefault(
       store,
       PHP_FUNCTIONNAME,
-      PHPColorProvider.FUNCTION_NAME);
+      PHPColorProvider.FUNCTION_NAME); 
     PreferenceConverter.setDefault(
       store,
       PHP_CONSTANT,
@@ -359,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,
@@ -377,8 +399,10 @@ public class PHPeclipsePlugin
     store.setDefault(PHP_OUTLINE_VAR, "true"); //$NON-NLS-1$
 
     TemplatePreferencePage.initDefaults(store);
-    new PHPSyntaxRdr();
     //this will initialize the static fields in the syntaxrdr class
+    new PHPSyntaxRdr();
+
+    PHPCore.initializeDefaultPluginPreferences();
   }
 
   public void startup() throws CoreException {