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 f50c26d..4c2ea9d 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
@@ -12,20 +12,19 @@ Contributors:
     Klaus Hartlage - www.eclipseproject.de
 **********************************************************************/
 
+import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.HTMLCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPCodeScanner;
-import net.sourceforge.phpeclipse.phpeditor.php.HTMLCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
 
 /** The PHPEditorEnvironment maintains singletons used by the php editor
  */
 public class PHPEditorEnvironment {
 
   private static PHPColorProvider fgColorProvider;
-  private static PHPCodeScanner fgCodeScanner;
+  private static PHPCodeScanner fgPHPCodeScanner;
   private static HTMLCodeScanner fgHTMLCodeScanner;
-  //private static JavaDocScanner fgDocScanner;
+  private static PHPDocCodeScanner fgDocScanner;
 
   private static int fgRefCount = 0;
 
@@ -35,9 +34,9 @@ public class PHPEditorEnvironment {
   public static void connect(Object client) {
     if (++fgRefCount == 1) {
       fgColorProvider = new PHPColorProvider();
-      fgCodeScanner = new PHPCodeScanner(fgColorProvider);
+      fgPHPCodeScanner = new PHPCodeScanner(fgColorProvider);
       fgHTMLCodeScanner = new HTMLCodeScanner(fgColorProvider);
-      //		fgDocScanner= new JavaDocScanner(fgColorProvider);
+      fgDocScanner = new PHPDocCodeScanner(fgColorProvider);
     }
   }
 
@@ -46,9 +45,9 @@ public class PHPEditorEnvironment {
    */
   public static void disconnect(Object client) {
     if (--fgRefCount == 0) {
-      fgCodeScanner = null;
+      fgPHPCodeScanner = null;
       fgHTMLCodeScanner = null;
-      //			fgDocScanner= null;
+      fgDocScanner = null;
       fgColorProvider.dispose();
       fgColorProvider = null;
     }
@@ -57,25 +56,29 @@ public class PHPEditorEnvironment {
   /**
    * Returns the singleton scanner.
    */
-  public static RuleBasedScanner getPHPCodeScanner() {
-    return fgCodeScanner;
+  public static PHPCodeScanner getPHPCodeScanner() {
+    return fgPHPCodeScanner;
   }
 
-  public static RuleBasedScanner getHTMLCodeScanner() {
+  /**
+   * Returns the singleton scanner.
+   */
+  public static HTMLCodeScanner getHTMLCodeScanner() {
     return fgHTMLCodeScanner;
   }
 
   /**
-   * Returns the singleton color provider.
+   * Returns the singleton PHPDoc scanner.
    */
-  public static PHPColorProvider getJavaColorProvider() {
-    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 PHPColorProvider getPHPColorProvider() {
+    return fgColorProvider;
+  }
+
 }