From general-return-1571-apmail-logging-general-archive=logging.apache.org@logging.apache.org Sat Oct 23 04:19:16 2010 Return-Path: Delivered-To: apmail-logging-general-archive@www.apache.org Received: (qmail 61041 invoked from network); 23 Oct 2010 04:19:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Oct 2010 04:19:16 -0000 Received: (qmail 35730 invoked by uid 500); 23 Oct 2010 04:19:15 -0000 Delivered-To: apmail-logging-general-archive@logging.apache.org Received: (qmail 35648 invoked by uid 500); 23 Oct 2010 04:19:13 -0000 Mailing-List: contact general-help@logging.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Logging General" List-Id: Delivered-To: mailing list general@logging.apache.org Received: (qmail 35638 invoked by uid 99); 23 Oct 2010 04:19:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Oct 2010 04:19:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Oct 2010 04:19:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9CEA12388978; Sat, 23 Oct 2010 04:18:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1026555 - /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java Date: Sat, 23 Oct 2010 04:18:12 -0000 To: general@logging.apache.org From: sdeboy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101023041812.9CEA12388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sdeboy Date: Sat Oct 23 04:18:10 2010 New Revision: 1026555 URL: http://svn.apache.org/viewvc?rev=1026555&view=rev Log: Table rendering update (font fix, label icon for 'basic' mode) Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java?rev=1026555&r1=1026554&r2=1026555&view=diff ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java Sat Oct 23 04:18:10 2010 @@ -197,6 +197,7 @@ public class TableColorizingRenderer ext return rendererComponent; } basicComponent = (JLabel)rendererComponent; + basicComponent.setFont(levelTextPane.getFont()); setBasicComponentBorder(basicComponent, isSelected, table, col); } long delta = 0; @@ -382,6 +383,23 @@ public class TableColorizingRenderer ext } textPaneContainer.add(textPane, BorderLayout.SOUTH); + if (delta == 0 || !logPanelPreferenceModel.isShowMillisDeltaAsGap()) { + if (col == 0) { + textPane.setBorder(getLeftBorder(isSelected, delta)); + } else if (col == table.getColumnCount() - 1) { + textPane.setBorder(getRightBorder(isSelected, delta)); + } else { + textPane.setBorder(getMiddleBorder(isSelected, delta)); + } + } else { + if (col == 0) { + textPane.setBorder(getLeftBorder(isSelected, 0)); + } else if (col == table.getColumnCount() - 1) { + textPane.setBorder(getRightBorder(isSelected, 0)); + } else { + textPane.setBorder(getMiddleBorder(isSelected, 0)); + } + } int currentMarkerHeight = loggingEventWrapper.getMarkerHeight(); int currentMsgHeight = loggingEventWrapper.getMsgHeight(); int newRowHeight = ChainsawConstants.DEFAULT_ROW_HEIGHT; @@ -425,13 +443,13 @@ public class TableColorizingRenderer ext } component = textPaneContainer; - setComponentBorder(component, isSelected, table, col, delta); } break; case ChainsawColumns.INDEX_LEVEL_COL_NAME: if (levelUseIcons) { if (basic) { basicComponent.setText(""); + basicComponent.setIcon((Icon)iconMap.get(value.toString())); if (!toolTipsVisible) { basicComponent.setToolTipText(value.toString()); } @@ -464,8 +482,6 @@ public class TableColorizingRenderer ext } } if (basic) { - basicComponent.setForeground(label.getForeground()); - basicComponent.setBackground(label.getBackground()); component = basicComponent; } else { levelTextPane.setForeground(label.getForeground());