You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@logging.apache.org by sd...@apache.org on 2010/08/14 08:43:30 UTC

svn commit: r985435 - in /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw: ChainsawToolBarAndMenus.java ReceiverConfigurationPanel.java color/ColorPanel.java receivers/PluginPropertyEditorPanel.java zeroconf/ZeroConfPlugin.java

Author: sdeboy
Date: Sat Aug 14 06:43:29 2010
New Revision: 985435

URL: http://svn.apache.org/viewvc?rev=985435&view=rev
Log:
Fix detail pane menu item selected state
Update table row heights

Modified:
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/color/ColorPanel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java?rev=985435&r1=985434&r2=985435&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java Sat Aug 14 06:43:29 2010
@@ -888,8 +888,10 @@ class ChainsawToolBarAndMenus implements
     LogPanel panel = logui.getCurrentLogPanel();
     if (panel != null) {
     	scrollToBottomButton.setSelected(panel.isScrollToBottom());
+        toggleDetailMenuItem.setSelected(panel.isDetailVisible());
     } else {
     	scrollToBottomButton.setSelected(false);
+        toggleDetailMenuItem.setSelected(false);
     }
     showReceiversButton.setSelected(
       logui.getApplicationPreferenceModel().isReceivers());

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java?rev=985435&r1=985434&r2=985435&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java Sat Aug 14 06:43:29 2010
@@ -272,7 +272,6 @@ class ReceiverConfigurationPanel extends
 
     private JPanel buildBottomDescriptionPanel() {
         JTextPane descriptionTextPane = new JTextPane();
-
         StyledDocument doc = descriptionTextPane.getStyledDocument();
         SimpleAttributeSet center = new SimpleAttributeSet();
         StyleConstants.setAlignment(center, StyleConstants.ALIGN_CENTER);
@@ -290,7 +289,6 @@ class ReceiverConfigurationPanel extends
         c.gridy = 0;
         c.weightx = 1.0;
         c.fill = GridBagConstraints.HORIZONTAL;
-        c.insets = new Insets(0, 0, 5, 0);
 
         panel.add(descriptionTextPane, c);
 

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=985435&r1=985434&r2=985435&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 Sat Aug 14 06:43:29 2010
@@ -133,13 +133,16 @@ public class ColorPanel extends JPanel
 
     tableModel = new DefaultTableModel();
     table = new JTable(tableModel);
+    table.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
 
     searchTableModel = new DefaultTableModel();
     searchTable = new JTable(searchTableModel);
+    searchTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
     searchTable.setPreferredScrollableViewportSize(new Dimension(30, 30));
 
     alternatingColorTableModel = new DefaultTableModel();
     alternatingColorTable = new JTable(alternatingColorTableModel);
+    alternatingColorTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
     alternatingColorTable.setPreferredScrollableViewportSize(new Dimension(30, 30));
 
     columns = new Vector();

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java?rev=985435&r1=985434&r2=985435&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java Sat Aug 14 06:43:29 2010
@@ -50,6 +50,7 @@ import javax.swing.table.TableModel;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.ChainsawConstants;
 import org.apache.log4j.chainsaw.Generator;
 import org.apache.log4j.chainsaw.helper.TableCellEditorFactory;
 import org.apache.log4j.net.SocketHubReceiver;
@@ -84,7 +85,7 @@ public class PluginPropertyEditorPanel e
      *
      */
     private void initComponents() {
-        propertyTable.setRowHeight(19);
+        propertyTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
         setLayout(new BorderLayout());
         scrollPane.setViewportView(propertyTable);
 

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java?rev=985435&r1=985434&r2=985435&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java (original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java Sat Aug 14 06:43:29 2010
@@ -54,6 +54,7 @@ import javax.swing.event.TableModelListe
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
+import org.apache.log4j.chainsaw.ChainsawConstants;
 import org.apache.log4j.chainsaw.SmallButton;
 import org.apache.log4j.chainsaw.help.HelpManager;
 import org.apache.log4j.chainsaw.icons.ChainsawIcons;
@@ -124,6 +125,7 @@ public class ZeroConfPlugin extends GUIP
 
     public ZeroConfPlugin() {
         setName("Zeroconf");
+        deviceTable.setRowHeight(ChainsawConstants.DEFAULT_ROW_HEIGHT);
     }
 
     public void shutdown() {