Author: sdeboy
Date: Wed May 20 08:21:45 2009
New Revision: 776608

URL: http://svn.apache.org/viewvc?rev=776608&view=rev
Log:
Replaced colors in colorpanel's drop down color list - fewer colors in the list, lighter shades and still readable with the default black text color.

Also updated default row colorization for WARN and FATAL/ERROR to use the new colors (only new tabs will automatically get the new warn and fatal/error colors-for existing tabs, you will have to change the color rules yourself)

Modified:
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java?rev=776608&r1=776607&r2=776608&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java Wed May 20 08:21:45 2009
@@ -228,37 +228,27 @@
     vec.add(Color.white);
     vec.add(Color.black);
 
-    vec.add(new Color(0, 153, 0));
-    vec.add(new Color(0, 204, 51));
-    vec.add(new Color(153, 255, 153));
-    vec.add(new Color(51, 255, 0));
-    vec.add(new Color(204, 255, 204));
-    vec.add(new Color(0, 153, 153));
-    vec.add(new Color(0, 204, 204));
-    vec.add(new Color(153, 102, 0));
-    vec.add(new Color(102, 102, 0));
-    vec.add(new Color(153, 153, 0));
-    vec.add(new Color(204, 204, 0));
-    vec.add(new Color(255, 255, 0));
-    vec.add(new Color(255, 255, 204));
-    vec.add(new Color(255, 153, 51));
-    vec.add(new Color(204, 0, 51));
-    vec.add(new Color(255, 51, 51));
+    vec.add(new Color(255, 255, 225));
+    vec.add(new Color(255, 225, 255));
+    vec.add(new Color(225, 255, 255));
+    vec.add(new Color(255, 225, 225));
+    vec.add(new Color(225, 255, 225));
+    vec.add(new Color(225, 225, 255));
+    vec.add(new Color(225, 225, 183));
+    vec.add(new Color(225, 183, 225));
+    vec.add(new Color(183, 225, 225));
+    vec.add(new Color(183, 225, 183));
+    vec.add(new Color(183, 183, 225));
+    vec.add(new Color(232, 201, 169));
+    vec.add(new Color(255, 255, 153));
     vec.add(new Color(255, 153, 153));
-    vec.add(new Color(255, 204, 204));
-    vec.add(new Color(204, 0, 204));
-    vec.add(new Color(255, 51, 255));
-    vec.add(new Color(153, 51, 255));
-    vec.add(new Color(0, 0, 153));
-    vec.add(new Color(0, 0, 255));
-    vec.add(new Color(51, 153, 255));
+    vec.add(new Color(189, 156, 89));
+    vec.add(new Color(255, 102, 102));
+    vec.add(new Color(255, 177, 61));
+    vec.add(new Color(61, 255, 61));
     vec.add(new Color(153, 153, 255));
-    vec.add(new Color(204, 204, 255));
-    vec.add(new Color(102, 255, 255));
-    vec.add(new Color(102, 102, 102));
-    vec.add(new Color(153, 153, 153));
-    vec.add(new Color(204, 204, 204));
-
+    vec.add(new Color(255, 153, 255));
+      
     return vec;
   }
 

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java?rev=776608&r1=776607&r2=776608&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/RuleColorizer.java Wed May 20 08:21:45 2009
@@ -58,12 +58,12 @@
     String expression = "level == FATAL || level == ERROR";
     rulesList.add(
       new ColorRule(
-        expression, ExpressionRule.getRule(expression), new Color(147, 22, 0),
-        Color.white));
+        expression, ExpressionRule.getRule(expression), new Color(255, 153, 153),
+        Color.black));
     expression = "level == WARN";
     rulesList.add(
       new ColorRule(
-        expression, ExpressionRule.getRule(expression), Color.yellow.brighter(),
+        expression, ExpressionRule.getRule(expression), new Color(255, 255, 153),
         Color.black));
     defaultRules.put(DEFAULT_NAME, rulesList);
     setRules(defaultRules);