sdeboy 2004/07/31 11:22:58
Modified: src/java/org/apache/log4j/chainsaw LogPanel.java
LoggerNameTreePanel.java
Log:
Minor changes to avoid null pointers in Chainsaw
Revision Changes Path
1.89 +1 -1 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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- LogPanel.java 29 Jul 2004 06:34:53 -0000 1.88
+++ LogPanel.java 31 Jul 2004 18:22:56 -0000 1.89
@@ -2395,7 +2395,7 @@
// they stopped typing recently, but have stopped for at least
// 1 sample period. lets apply the filter
// LogLog.debug("Typed something recently applying
filter");
- if (filterText.getText() != lastFilterText) {
+ if (filterText != null &&
(!(filterText.getText().equals(lastFilterText)))) {
lastFilterText = filterText.getText();
setFilter();
}
1.31 +22 -28
logging-log4j/src/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java
Index: LoggerNameTreePanel.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/LoggerNameTreePanel.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- LoggerNameTreePanel.java 28 Jul 2004 08:02:17 -0000 1.30
+++ LoggerNameTreePanel.java 31 Jul 2004 18:22:57 -0000 1.31
@@ -128,13 +128,7 @@
private final LogPanelLoggerTreeModel logTreeModel;
private final PopupListener popupListener;
private final LoggerTreePopupMenu popupMenu;
- private Rule ruleDelegate = new AbstractRule()
- {
- public boolean evaluate(LoggingEvent e)
- {
- return true;
- }
- };
+ private final Rule ruleDelegate;
private Rule colorRuleDelegate;
private final JScrollPane scrollTree;
private final JToolBar toolbar = new JToolBar();
@@ -154,6 +148,26 @@
setLayout(new BorderLayout());
+ ruleDelegate = new AbstractRule() {
+ public boolean evaluate(LoggingEvent e)
+ {
+ String currentlySelectedLoggerName = getCurrentlySelectedLoggerName();
+ if (currentlySelectedLoggerName == null) {
+ //if there is no selected logger, all events should pass
+ return true;
+ }
+ boolean isHidden = getHiddenSet().contains(e.getLoggerName());
+ boolean result = (e.getLoggerName() != null) && (!isHidden);
+
+ if (result && isFocusOnSelected())
+ {
+ result = result && (e.getLoggerName() != null &&
(e.getLoggerName().startsWith(currentlySelectedLoggerName+".") ||
e.getLoggerName().endsWith(currentlySelectedLoggerName))) ;
+ }
+
+ return result;
+ }
+ };
+
colorRuleDelegate =
new AbstractRule()
{
@@ -170,7 +184,6 @@
}
};
-
logTree =
new JTree(logTreeModel)
{
@@ -1038,25 +1051,6 @@
{
public void stateChanged(ChangeEvent evt)
{
- final String currentlySelectedLoggerName =
- getCurrentlySelectedLoggerName();
-
- ruleDelegate =
- new AbstractRule()
- {
- public boolean evaluate(LoggingEvent e)
- {
- boolean isHidden = getHiddenSet().contains(e.getLoggerName());
- boolean result = (e.getLoggerName() != null) && (!isHidden);
-
- if (result && isFocusOnSelected())
- {
- result = result && (e.getLoggerName() != null &&
(e.getLoggerName().startsWith(currentlySelectedLoggerName+".") ||
e.getLoggerName().endsWith(currentlySelectedLoggerName))) ;
- }
-
- return result;
- }
- };
firePropertyChange("rule", null, null);
updateAllIgnoreStuff();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
