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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
index 1b698a0..5243cfa 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
@@ -12,6 +12,9 @@ Contributors:
     Klaus Hartlage - www.eclipseproject.de
 **********************************************************************/
 
+import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
+import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCodeScanner;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.php.HTMLCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
@@ -19,11 +22,11 @@ import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 /** The PHPEditorEnvironment maintains singletons used by the php editor
  */
 public class PHPEditorEnvironment {
-
-  private static PHPColorProvider fgColorProvider;
+ // PHPColorProvider
+  private static JavaColorManager fgColorProvider;
   private static PHPCodeScanner fgPHPCodeScanner;
   private static HTMLCodeScanner fgHTMLCodeScanner;
-  //private static JavaDocScanner fgDocScanner;
+  private static PHPDocCodeScanner fgDocScanner;
 
   private static int fgRefCount = 0;
 
@@ -32,10 +35,10 @@ public class PHPEditorEnvironment {
    */
   public static void connect(Object client) {
     if (++fgRefCount == 1) {
-      fgColorProvider = new PHPColorProvider();
-      fgPHPCodeScanner = new PHPCodeScanner(fgColorProvider);
-      fgHTMLCodeScanner = new HTMLCodeScanner(fgColorProvider);
-      //		fgDocScanner= new JavaDocScanner(fgColorProvider);
+      fgColorProvider = new JavaColorManager(); // new PHPColorProvider();
+      fgPHPCodeScanner = new PHPCodeScanner(fgColorProvider, PHPeclipsePlugin.getDefault().getPreferenceStore() );
+      fgHTMLCodeScanner = new HTMLCodeScanner(fgColorProvider, PHPeclipsePlugin.getDefault().getPreferenceStore());
+      fgDocScanner = new PHPDocCodeScanner(fgColorProvider, PHPeclipsePlugin.getDefault().getPreferenceStore() );
     }
   }
 
@@ -46,7 +49,7 @@ public class PHPEditorEnvironment {
     if (--fgRefCount == 0) {
       fgPHPCodeScanner = null;
       fgHTMLCodeScanner = null;
-      //			fgDocScanner= null;
+      fgDocScanner = null;
       fgColorProvider.dispose();
       fgColorProvider = null;
     }
@@ -59,21 +62,25 @@ public class PHPEditorEnvironment {
     return fgPHPCodeScanner;
   }
 
+  /**
+   * Returns the singleton scanner.
+   */
   public static HTMLCodeScanner getHTMLCodeScanner() {
     return fgHTMLCodeScanner;
   }
 
   /**
-   * Returns the singleton color provider.
+   * Returns the singleton PHPDoc scanner.
    */
-  public static PHPColorProvider getPHPColorProvider() {
-    return fgColorProvider;
+  public static PHPDocCodeScanner getPHPDocCodeScanner() {
+    return fgDocScanner;
   }
 
   /**
-   * Returns the singleton document scanner.
+   * Returns the singleton color provider.
    */
-  //	 public static RuleBasedScanner getJavaDocScanner() {
-  //		return fgDocScanner;
-  //	}
+  public static JavaColorManager getPHPColorProvider() {
+    return fgColorProvider;
+  }
+
 }