svn commit: r944072 - in /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw: ChainsawTabbedPane.java LogPanel.java

Author: sdeboy
Date: Fri May 14 01:10:03 2010
New Revision: 944072

URL: http://svn.apache.org/viewvc?rev=944072&view=rev
Log:
Fix deadlock (chainsawtabbedpane addtab methods were synchronized)
UI tweak: when the 'refine focus' drop down appears because of autocompletion, make sure no row is selected

Modified:
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogPanel.java

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java?rev=944072&r1=944071&r2=944072&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java Fri May 14 01:10:03 2010
@@ -94,7 +94,7 @@ class ChainsawTabbedPane extends JTabbed
    * @param name
    * @param component
    */
-  public synchronized void addANewTab(String name, JComponent component, Icon icon) {
+  public void addANewTab(String name, JComponent component, Icon icon) {
     super.insertTab(name, icon, component, null, getTabCount());
 
     super.fireStateChanged();
@@ -117,7 +117,7 @@ class ChainsawTabbedPane extends JTabbed
     super.fireStateChanged();
   }
 
-  public synchronized void addANewTab(
+  public void addANewTab(
     String name, JComponent component, Icon icon, String tooltip) {
     super.insertTab(name, icon, component, tooltip, getTabCount());
     super.fireStateChanged();

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=944072&r1=944071&r2=944072&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 Fri May 14 01:10:03 2010
@@ -1020,7 +1020,6 @@ public class LogPanel extends DockablePa
     filterExpressionVector.add("LEVEL == FATAL");
     
     filterCombo = new AutoFilterComboBox(filterExpressionVector);
-    filterCombo.setSelectedIndex(-1);
     final JTextField filterText =(JTextField) filterCombo.getEditor().getEditorComponent();
     filterText.getDocument().addDocumentListener(new DelayedFilterTextDocumentListener(filterText));
     filterText.setToolTipText("Enter an expression, press enter to add to list");
@@ -3712,6 +3711,9 @@ public class LogPanel extends DockablePa
             private boolean willBecomeVisible = false;
 
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                bypassFiltering = true;
+                ((JComboBox)e.getSource()).setSelectedIndex(-1);
+                bypassFiltering = false;
                 if (!willBecomeVisible) {
                     //we already have a match but we're showing the popup - unfilter
                     if (displayedEntries.contains(textField.getText())) {