svn commit: r1027814 - in /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw: LogPanel.java color/ColorPanel.java plugins/PluginClassLoaderFactory.java

[sdeboy]

Author: sdeboy
Date: Wed Oct 27 04:46:15 2010
New Revision: 1027814

URL: http://svn.apache.org/viewvc?rev=1027814&view=rev
Log:
Minor UI tweaks
 - removed unnecessary jseparator from search panel popup
 - Wrapping creation of colorchoosers in runonEDT calls
 - removed call to system.err.println

Modified:
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
    
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
    
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java

Modified: 
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java
URL: 
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java?rev=1027814&r1=1027813&r2=1027814&view=diff
==============================================================================
--- 
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java 
(original)
+++ 
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java 
Wed Oct 27 04:46:15 2010
@@ -1918,7 +1918,6 @@ public class LogPanel extends DockablePa
     mainPopup.add(menuItemToggleDock);
 
     mainPopup.add(new JSeparator());
-    searchPopup.add(new JSeparator());
 
     mainPopup.add(new ColorPanel());
     searchPopup.add(new ColorPanel());

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=1027814&r1=1027813&r2=1027814&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 Oct 27 04:46:15 2010
@@ -68,6 +68,7 @@ import org.apache.log4j.chainsaw.Applica
 import org.apache.log4j.chainsaw.ChainsawConstants;
 import org.apache.log4j.chainsaw.ExpressionRuleContext;
 import org.apache.log4j.chainsaw.filter.FilterModel;
+import org.apache.log4j.chainsaw.helper.SwingHelper;
 import org.apache.log4j.chainsaw.icons.ChainsawIcons;
 import org.apache.log4j.rule.ColorRule;
 import org.apache.log4j.rule.ExpressionRule;
@@ -190,14 +191,24 @@ public class ColorPanel extends JPanel
     searchTable.getColumnModel().getColumn(1).setPreferredWidth(80);
     searchTable.getColumnModel().getColumn(0).setMaxWidth(80);
     searchTable.getColumnModel().getColumn(1).setMaxWidth(80);
-    configureSingleEntryColorTable(searchTable);
+    //building color choosers needs to be done on the EDT
+    SwingHelper.invokeOnEDT(new Runnable() {
+      public void run() {
+        configureSingleEntryColorTable(searchTable);
+      }
+    });
 
     alternatingColorTable.sizeColumnsToFit(0);
     alternatingColorTable.getColumnModel().getColumn(0).setPreferredWidth(80);
     alternatingColorTable.getColumnModel().getColumn(1).setPreferredWidth(80);
     alternatingColorTable.getColumnModel().getColumn(0).setMaxWidth(80);
     alternatingColorTable.getColumnModel().getColumn(1).setMaxWidth(80);
-    configureSingleEntryColorTable(alternatingColorTable);
+    //building color choosers needs to be done on the EDT
+    SwingHelper.invokeOnEDT(new Runnable() {
+      public void run() {
+        configureSingleEntryColorTable(alternatingColorTable);
+      }
+    });
 
     configureTable();
 

Modified: 
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
URL: 
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java?rev=1027814&r1=1027813&r2=1027814&view=diff
==============================================================================
--- 
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
 (original)
+++ 
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java
 Wed Oct 27 04:46:15 2010
@@ -67,7 +67,6 @@ public class PluginClassLoaderFactory {
      */
     private static final ClassLoader create(File pluginDirectory) {
         if(pluginDirectory == null || !pluginDirectory.exists() || 
!pluginDirectory.canRead()) {
-         System.err.println("pluginDirectory cannot be null, and it must exist 
and must be readable, using the normal Classloader");
          return PluginClassLoaderFactory.class.getClassLoader();
         }