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;
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
*/
/**
* 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(
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(
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));