You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by sd...@apache.org on 2004/03/25 09:21:05 UTC
cvs commit: logging-log4j/src/java/org/apache/log4j/chainsaw LogPanel.java ChainsawToolBarAndMenus.java
sdeboy 2004/03/25 00:21:05
Modified: src/java/org/apache/log4j/chainsaw LogPanel.java
ChainsawToolBarAndMenus.java
Log:
updated scroll/cyclic buffer detail pane selection logic
updated find next/previous descriptions
Revision Changes Path
1.59 +7 -13 logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java
Index: LogPanel.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LogPanel.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- LogPanel.java 23 Mar 2004 07:00:22 -0000 1.58
+++ LogPanel.java 25 Mar 2004 08:21:04 -0000 1.59
@@ -1273,7 +1273,6 @@
if (rowAdded) {
- int currentRow = table.getSelectedRow();
if (tableModel.isSortEnabled()) {
tableModel.sort();
}
@@ -1284,15 +1283,9 @@
if (scroll && !bypassScroll) {
table.scrollToBottom(
table.columnAtPoint(table.getVisibleRect().getLocation()));
- } else {
- if (!bypassScroll) {
- table.scrollToRow(
- currentRow, table.columnAtPoint(
- table.getVisibleRect().getLocation()));
- }
- //always update detail pane (since we may be using a cyclic buffer which is full)
- detailPaneUpdater.setSelectedRow(currentRow);
}
+ //always update detail pane (since we may be using a cyclic buffer which is full)
+ detailPaneUpdater.setSelectedRow(table.getSelectedRow());
}
}
@@ -1535,7 +1528,7 @@
findRule = ExpressionRule.getRule(ruleText);
colorizer.setFindRule(findRule);
return true;
- } catch (RuntimeException re) {
+ } catch (IllegalArgumentException re) {
findField.setToolTipText(re.getMessage());
colorizer.setFindRule(null);
return false;
@@ -1716,7 +1709,7 @@
undockedFindNextAction.putValue(Action.NAME, "Find next");
undockedFindNextAction.putValue(
- Action.SHORT_DESCRIPTION, "Finds the next occurrence within this view");
+ Action.SHORT_DESCRIPTION, "Find the next occurrence of the rule from the current row");
undockedFindNextAction.putValue(
Action.SMALL_ICON, new ImageIcon(ChainsawIcons.DOWN));
@@ -1736,9 +1729,9 @@
}
};
- undockedFindPreviousAction.putValue(Action.NAME, "Find next");
+ undockedFindPreviousAction.putValue(Action.NAME, "Find previous");
undockedFindPreviousAction.putValue(
- Action.SHORT_DESCRIPTION, "Finds the next occurrence within this view");
+ Action.SHORT_DESCRIPTION, "Find the previous occurrence of the rule from the current row");
undockedFindPreviousAction.putValue(
Action.SMALL_ICON, new ImageIcon(ChainsawIcons.UP));
@@ -1850,6 +1843,7 @@
}
} catch (IllegalArgumentException iae) {
findField.setToolTipText(iae.getMessage());
+ colorizer.setFindRule(null);
}
}
}
1.37 +2 -2 logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
Index: ChainsawToolBarAndMenus.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChainsawToolBarAndMenus.java 23 Mar 2004 07:00:22 -0000 1.36
+++ ChainsawToolBarAndMenus.java 25 Mar 2004 08:21:04 -0000 1.37
@@ -752,7 +752,7 @@
action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("F3"));
action.putValue(
Action.SHORT_DESCRIPTION,
- "Finds the next occurrence of the rule from the current row");
+ "Find the next occurrence of the rule from the current row");
action.putValue(Action.SMALL_ICON, new ImageIcon(ChainsawIcons.DOWN));
return action;
@@ -774,7 +774,7 @@
action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F3, KeyEvent.SHIFT_DOWN_MASK));
action.putValue(
Action.SHORT_DESCRIPTION,
- "Finds the previous occurrence of the rule from the current row");
+ "Find the previous occurrence of the rule from the current row");
action.putValue(Action.SMALL_ICON, new ImageIcon(ChainsawIcons.UP));
return action;
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org