misc changes

[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 47760a9..f50c26d 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
@@ -12,63 +12,70 @@ Contributors:
     Klaus Hartlage - www.eclipseproject.de
 **********************************************************************/
 
-import org.eclipse.jface.text.rules.RuleBasedScanner;
+import net.sourceforge.phpeclipse.phpeditor.php.HTMLCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPCodeScanner;
-//import net.sourceforge.phpeclipse.phpeditor.html.JavaDocScanner;
+import net.sourceforge.phpeclipse.phpeditor.php.HTMLCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
 
-/** The JavaEditorEnvironment maintains singletons used by the java editor
- * examples.
+/** The PHPEditorEnvironment maintains singletons used by the php editor
  */
 public class PHPEditorEnvironment {
 
-       private static PHPColorProvider fgColorProvider;
-       private static PHPCodeScanner fgCodeScanner;
-       //private static JavaDocScanner fgDocScanner;
+  private static PHPColorProvider fgColorProvider;
+  private static PHPCodeScanner fgCodeScanner;
+  private static HTMLCodeScanner fgHTMLCodeScanner;
+  //private static JavaDocScanner fgDocScanner;
+
+  private static int fgRefCount = 0;
+
+  /**
+   * A connection has occured - initialize the receiver if it is the first activation.
+   */
+  public static void connect(Object client) {
+    if (++fgRefCount == 1) {
+      fgColorProvider = new PHPColorProvider();
+      fgCodeScanner = new PHPCodeScanner(fgColorProvider);
+      fgHTMLCodeScanner = new HTMLCodeScanner(fgColorProvider);
+      //               fgDocScanner= new JavaDocScanner(fgColorProvider);
+    }
+  }
+
+  /**
+   * A disconnection has occured - clear the receiver if it is the last deactivation.
+   */
+  public static void disconnect(Object client) {
+    if (--fgRefCount == 0) {
+      fgCodeScanner = null;
+      fgHTMLCodeScanner = null;
+      //                       fgDocScanner= null;
+      fgColorProvider.dispose();
+      fgColorProvider = null;
+    }
+  }
+
+  /**
+   * Returns the singleton scanner.
+   */
+  public static RuleBasedScanner getPHPCodeScanner() {
+    return fgCodeScanner;
+  }
+
+  public static RuleBasedScanner getHTMLCodeScanner() {
+    return fgHTMLCodeScanner;
+  }
 
-       private static int fgRefCount= 0;
+  /**
+   * Returns the singleton color provider.
+   */
+  public static PHPColorProvider getJavaColorProvider() {
+    return fgColorProvider;
+  }
 
-       /**
-        * A connection has occured - initialize the receiver if it is the first activation.
-        */
-       public static void connect(Object client) {
-               if (++fgRefCount == 1) {
-                       fgColorProvider= new PHPColorProvider();
-                       fgCodeScanner= new PHPCodeScanner(fgColorProvider);
-       //              fgDocScanner= new JavaDocScanner(fgColorProvider);
-               }
-       }
-       
-       /**
-        * A disconnection has occured - clear the receiver if it is the last deactivation.
-        */
-        public static void disconnect(Object client) {
-               if (--fgRefCount == 0) {
-                       fgCodeScanner= null;
-//                     fgDocScanner= null;
-                       fgColorProvider.dispose();
-                       fgColorProvider= null;
-               }
-       }
-       
-       /**
-        * Returns the singleton scanner.
-        */
-        public static RuleBasedScanner getPHPCodeScanner() {
-               return fgCodeScanner;
-       }
-       
-       /**
-        * Returns the singleton color provider.
-        */
-        public static PHPColorProvider getJavaColorProvider() {
-               return fgColorProvider;
-       }
-       
-       /**
-        * Returns the singleton document scanner.
-        */
-//      public static RuleBasedScanner getJavaDocScanner() {
-//             return fgDocScanner;
-//     }
+  /**
+   * Returns the singleton document scanner.
+   */
+  //    public static RuleBasedScanner getJavaDocScanner() {
+  //           return fgDocScanner;
+  //   }
 }