*** empty log message ***

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPEditorEnvironment.java

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..1b698a0 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
@@ -14,16 +14,14 @@ Contributors:
 
 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;
 
@@ -35,7 +33,7 @@ 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);
     }
@@ -46,7 +44,7 @@ public class PHPEditorEnvironment {
    */
   public static void disconnect(Object client) {
     if (--fgRefCount == 0) {
-      fgCodeScanner = null;
+      fgPHPCodeScanner = null;
       fgHTMLCodeScanner = null;
       //                       fgDocScanner= null;
       fgColorProvider.dispose();
@@ -57,18 +55,18 @@ public class PHPEditorEnvironment {
   /**
    * Returns the singleton scanner.
    */
-  public static RuleBasedScanner getPHPCodeScanner() {
-    return fgCodeScanner;
+  public static PHPCodeScanner getPHPCodeScanner() {
+    return fgPHPCodeScanner;
   }
 
-  public static RuleBasedScanner getHTMLCodeScanner() {
+  public static HTMLCodeScanner getHTMLCodeScanner() {
     return fgHTMLCodeScanner;
   }
 
   /**
    * Returns the singleton color provider.
    */
-  public static PHPColorProvider getJavaColorProvider() {
+  public static PHPColorProvider getPHPColorProvider() {
     return fgColorProvider;
   }