Added PHPUnitEditor and corresponding PHPPreferencePage

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / php / PHPCodeScanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
index e3ca314..d7c77f6 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
@@ -15,6 +15,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
+import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
+import net.sourceforge.phpeclipse.IPreferenceConstants;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
+import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPWhitespaceDetector;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPWordDetector;
 
@@ -35,11 +40,6 @@ import org.eclipse.jface.text.rules.WordRule;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 
-import net.sourceforge.phpeclipse.IPreferenceConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
-import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
-
 /**
  * PHP Code Scanner
  */
@@ -106,8 +106,8 @@ public class PHPCodeScanner extends RuleBasedScanner implements IPreferenceConst
   /**
        * Creates a PHP code scanner
        */
-  public PHPCodeScanner(PHPColorProvider provider) {
-    final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+  public PHPCodeScanner(JavaColorManager provider, IPreferenceStore store) {
+  //  final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
     Color BackgroundColor = provider.getColor(PreferenceConverter.getColor(store, PHP_EDITOR_BACKGROUND));
     variable =
       new Token(
@@ -146,13 +146,13 @@ public class PHPCodeScanner extends RuleBasedScanner implements IPreferenceConst
           provider.getColor(PreferenceConverter.getColor(store, PHP_STRING)),
           BackgroundColor,
     //SWT.NONE));
-   (store.getBoolean(PHP_STRING_BOLD) ? SWT.NONE : SWT.BOLD) + (store.getBoolean(PHP_STRING_ITALIC) ? SWT.ITALIC : SWT.NONE)));
+   (store.getBoolean(PHP_STRING_BOLD) ? SWT.BOLD : SWT.NONE ) + (store.getBoolean(PHP_STRING_ITALIC) ? SWT.ITALIC : SWT.NONE)));
       comment =
         new Token(new TextAttribute(
           provider.getColor(PreferenceConverter.getColor(store, PHP_SINGLELINE_COMMENT)),
           BackgroundColor,
     //SWT.NONE));
-  (store.getBoolean(PHP_SINGLELINE_COMMENT_BOLD) ? SWT.NONE : SWT.BOLD)
+  (store.getBoolean(PHP_SINGLELINE_COMMENT_BOLD) ? SWT.BOLD : SWT.NONE )
     + (store.getBoolean(PHP_SINGLELINE_COMMENT_ITALIC) ? SWT.ITALIC : SWT.NONE)));
       multi_comment =
         new Token(new TextAttribute(
@@ -170,7 +170,7 @@ public class PHPCodeScanner extends RuleBasedScanner implements IPreferenceConst
     updateWordRules();
   }
 
-  public void updateToken(PHPColorProvider provider) {
+  public void updateToken(JavaColorManager provider) {
     final IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
 
     Color BackgroundColor = provider.getColor(PreferenceConverter.getColor(store, PHP_EDITOR_BACKGROUND));