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 f50c26d..8ebe447 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java @@ -23,7 +23,7 @@ import org.eclipse.jface.text.rules.RuleBasedScanner; 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 +35,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 +46,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 +57,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; }