sdeboy 2003/12/15 17:00:12
Modified: src/java/org/apache/log4j/chainsaw
ChainsawToolBarAndMenus.java
LoggingEventFieldResolver.java
. build.xml
Log:
Updated lookup for tab placement used by toolbarsandmenus
added a null check in tab expression lookup code
fixed examples build problem (jmx exclusion needed fixed)
Revision Changes Path
1.27 +1 -1
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
Index: ChainsawToolBarAndMenus.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChainsawToolBarAndMenus.java 14 Dec 2003 21:27:38 -0000 1.26
+++ ChainsawToolBarAndMenus.java 16 Dec 2003 01:00:12 -0000 1.27
@@ -100,7 +100,7 @@
*/
class ChainsawToolBarAndMenus implements ChangeListener, SettingsListener {
private static final String SETTING_RESPONSIVENESS = "Responsiveness";
- private static final String SETTING_TAB_PLACEMENT = "tab.placement";
+ private static final String SETTING_TAB_PLACEMENT = "tabPlacement";
private final SmallToggleButton showReceiversButton;
final JTextField findTextField;
private final Action changeModelAction;
1.16 +3 -0
jakarta-log4j/src/java/org/apache/log4j/chainsaw/LoggingEventFieldResolver.java
Index: LoggingEventFieldResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LoggingEventFieldResolver.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- LoggingEventFieldResolver.java 11 Dec 2003 06:10:27 -0000 1.15
+++ LoggingEventFieldResolver.java 16 Dec 2003 01:00:12 -0000 1.16
@@ -132,6 +132,9 @@
}
public String applyFields(String replaceText, LoggingEvent event) {
+ if (replaceText == null) {
+ return null;
+ }
StringTokenizer tokenizer = new StringTokenizer(replaceText);
StringBuffer result = new StringBuffer();
1.83 +1 -1 jakarta-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/build.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- build.xml 14 Dec 2003 20:35:09 -0000 1.82
+++ build.xml 16 Dec 2003 01:00:12 -0000 1.83
@@ -238,7 +238,7 @@
<javac srcdir="${examples.src}"
destdir="${examples.javac.dest}"
includes="**/*.java"
- excludes="jmx/*.java"
+ excludes="src/jmx/*.java"
deprecation="${deprecation}"
debug="on">
<classpath refid="compile.classpath"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
