You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/05/30 23:48:40 UTC
[03/50] [abbrv] logging-chainsaw git commit: Table rendering update
(font fix, label icon for 'basic' mode)
Table rendering update (font fix, label icon for 'basic' mode)
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/0dcec147
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/0dcec147
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/0dcec147
Branch: refs/heads/master
Commit: 0dcec1476e0a8e876ef8fe271110075564fd0f20
Parents: 66805db
Author: Scott Deboy <sd...@apache.org>
Authored: Sat Oct 23 04:18:10 2010 +0000
Committer: Scott Deboy <sd...@apache.org>
Committed: Sat Oct 23 04:18:10 2010 +0000
----------------------------------------------------------------------
.../log4j/chainsaw/TableColorizingRenderer.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/0dcec147/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
index 33d74d1..37c2b7e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
@@ -197,6 +197,7 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer {
return rendererComponent;
}
basicComponent = (JLabel)rendererComponent;
+ basicComponent.setFont(levelTextPane.getFont());
setBasicComponentBorder(basicComponent, isSelected, table, col);
}
long delta = 0;
@@ -382,6 +383,23 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer {
}
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 extends DefaultTableCellRenderer {
}
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 extends DefaultTableCellRenderer {
}
}
if (basic) {
- basicComponent.setForeground(label.getForeground());
- basicComponent.setBackground(label.getBackground());
component = basicComponent;
} else {
levelTextPane.setForeground(label.getForeground());