[jboss-svn-commits] JBL Code SVN: r15159 - in labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors: scanners and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2007-09-16 21:04:39 -0400 (Sun, 16 Sep 2007)
New Revision: 15159

Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/ColorManager.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLSourceViewerConfig.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/scanners/DRLScanner.java
Log:
JBRULES-944: Support in Rule Workbench for custom colors
 - Foreground color of text can now also be customized (in general preferences)

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/ColorManager.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/ColorManager.java	2007-09-17 00:28:33 UTC (rev 15158)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/ColorManager.java	2007-09-17 01:04:39 UTC (rev 15159)
@@ -20,7 +20,6 @@
     public static final RGB SINGLE_LINE_COMMENT = new RGB(128, 128, 0);
     public static final RGB KEYWORD = new RGB(150, 0, 0);
     public static final RGB STRING = new RGB(0, 128, 0); 
-    public static final RGB DEFAULT = new RGB(0, 0, 0);
 
 	protected Map colorTable = new HashMap(10);
 

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLSourceViewerConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLSourceViewerConfig.java	2007-09-17 00:28:33 UTC (rev 15158)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/DRLSourceViewerConfig.java	2007-09-17 01:04:39 UTC (rev 15159)
@@ -20,7 +20,6 @@
 import org.eclipse.jface.text.source.IAnnotationHover;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.swt.graphics.Color;
 
 /**
  * Source viewer config wires up the syntax highlighting, partitioning
@@ -33,9 +32,6 @@
 
 	private DRLScanner scanner;
 
-	private static Color DEFAULT_COLOR =
-		ColorManager.getInstance().getColor(ColorManager.DEFAULT);
-
 	private AbstractRuleEditor editor;
 
 	public DRLSourceViewerConfig(AbstractRuleEditor editor) {
@@ -49,7 +45,6 @@
 	protected DRLScanner getScanner() {
 		if (scanner == null) {
 			scanner = new DRLScanner();
-			scanner.setDefaultReturnToken(new Token(new TextAttribute(DEFAULT_COLOR)));
 		}
 		return scanner;
 	}

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/scanners/DRLScanner.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/scanners/DRLScanner.java	2007-09-17 00:28:33 UTC (rev 15158)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/scanners/DRLScanner.java	2007-09-17 01:04:39 UTC (rev 15159)
@@ -29,7 +29,6 @@
 	private static final Color KEYWORD_COLOR = ColorManager.getInstance().getColor(ColorManager.KEYWORD);
 	private static final Color COMMENT_COLOR = ColorManager.getInstance().getColor(ColorManager.SINGLE_LINE_COMMENT);
     private static final Color STRING_COLOR = ColorManager.getInstance().getColor(ColorManager.STRING);
-    private static final Color DEFAULT_COLOR = ColorManager.getInstance().getColor(ColorManager.DEFAULT);
 
     private static final String[] DROOLS_KEYWORDS = Keywords.getInstance().getAllDroolsKeywords();
     private static final String[] JAVA_KEYWORDS = Keywords.getInstance().getAllJavaKeywords();
@@ -46,7 +45,6 @@
 		IToken keyword = new Token(new TextAttribute(KEYWORD_COLOR, null, SWT.BOLD));
 		IToken comment= new Token(new TextAttribute(COMMENT_COLOR));
 		IToken string = new Token(new TextAttribute(STRING_COLOR));
-		IToken other = new Token(new TextAttribute(DEFAULT_COLOR));
 
         List rules = new ArrayList();
 
@@ -64,7 +62,7 @@
         rules.add(new WhitespaceRule(new WhitespaceDetector()));
 
         // Add word rule for keywords, types, and constants.
-        WordRule wordRule= new WordRule(new RuleWordDetector(), other);
+        WordRule wordRule= new WordRule(new RuleWordDetector());
         for (int i= 0; i < DROOLS_KEYWORDS.length; i++)
             wordRule.addWord(DROOLS_KEYWORDS[i], keyword);