Minor UI tweaks - removed unnecessary jseparator from search panel popup - Wrapping creation of colorchoosers in runonEDT calls - removed call to system.err.println
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/d5c24ec8 Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/d5c24ec8 Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/d5c24ec8 Branch: refs/heads/master Commit: d5c24ec85f337d2d9a43d2bb0e4b582a7323fbdc Parents: ab85cf0 Author: Scott Deboy <[email protected]> Authored: Wed Oct 27 04:46:15 2010 +0000 Committer: Scott Deboy <[email protected]> Committed: Wed Oct 27 04:46:15 2010 +0000 ---------------------------------------------------------------------- .../java/org/apache/log4j/chainsaw/LogPanel.java | 1 - .../org/apache/log4j/chainsaw/color/ColorPanel.java | 15 +++++++++++++-- .../chainsaw/plugins/PluginClassLoaderFactory.java | 1 - 3 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/d5c24ec8/src/main/java/org/apache/log4j/chainsaw/LogPanel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java index 189cac4..2ff874d 100644 --- a/src/main/java/org/apache/log4j/chainsaw/LogPanel.java +++ b/src/main/java/org/apache/log4j/chainsaw/LogPanel.java @@ -1918,7 +1918,6 @@ public class LogPanel extends DockablePanel implements EventBatchListener, Profi mainPopup.add(menuItemToggleDock); mainPopup.add(new JSeparator()); - searchPopup.add(new JSeparator()); mainPopup.add(new ColorPanel()); searchPopup.add(new ColorPanel()); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/d5c24ec8/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java index 7dc0911..6234680 100644 --- a/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java +++ b/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java @@ -68,6 +68,7 @@ import org.apache.log4j.chainsaw.ApplicationPreferenceModel; 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(); http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/d5c24ec8/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java b/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java index 2ef492e..b96e7c9 100644 --- a/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java +++ b/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java @@ -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(); }
