X-Git-Url: http://secure.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 4c2ea9d..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,7 +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;
@@ -20,8 +22,8 @@ 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 PHPDocCodeScanner fgDocScanner;
@@ -33,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 PHPDocCodeScanner(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() );
     }
   }
 
@@ -77,7 +79,7 @@ public class PHPEditorEnvironment {
   /**
    * Returns the singleton color provider.
    */
-  public static PHPColorProvider getPHPColorProvider() {
+  public static JavaColorManager getPHPColorProvider() {
     return fgColorProvider;
   }