sdeboy 2004/05/23 09:15:07
Modified: src/java/org/apache/log4j/chainsaw FileMenu.java
FileLoadAction.java
src/java/org/apache/log4j/xml UtilLoggingXMLDecoder.java
XMLDecoder.java
src/java/org/apache/log4j/chainsaw/help release-notes.html
Log:
Ongoing work to improve xml decoder.
Can now display a progress bar when processing files.
Revision Changes Path
1.7 +6 -4 logging-log4j/src/java/org/apache/log4j/chainsaw/FileMenu.java
Index: FileMenu.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/FileMenu.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileMenu.java 23 Mar 2004 07:00:22 -0000 1.6
+++ FileMenu.java 23 May 2004 16:15:05 -0000 1.7
@@ -32,6 +32,8 @@
import javax.swing.KeyStroke;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
+import org.apache.log4j.xml.UtilLoggingXMLDecoder;
+import org.apache.log4j.xml.XMLDecoder;
/**
@@ -55,7 +57,7 @@
loadLog4JAction =
new FileLoadAction(
- logUI, "org.apache.log4j.xml.XMLDecoder", "Load Log4J File...", false);
+ logUI, new XMLDecoder(logUI), "Load Log4J File...", false);
loadLog4JAction.putValue(
Action.ACCELERATOR_KEY,
@@ -66,16 +68,16 @@
loadUtilLoggingAction =
new FileLoadAction(
- logUI, "org.apache.log4j.xml.UtilLoggingXMLDecoder",
+ logUI, new UtilLoggingXMLDecoder(logUI),
"Load Java Util File...", false);
remoteLog4JAction =
new FileLoadAction(
- logUI, "org.apache.log4j.xml.XMLDecoder", "Load Remote Log4J File...",
+ logUI, new XMLDecoder(logUI), "Load Remote Log4J File...",
true);
remoteUtilLoggingAction =
new FileLoadAction(
- logUI, "org.apache.log4j.xml.UtilLoggingXMLDecoder",
+ logUI, new UtilLoggingXMLDecoder(logUI),
"Load Remote Java Util File...", true);
saveAction = new FileSaveAction(logUI);
1.11 +2 -14
logging-log4j/src/java/org/apache/log4j/chainsaw/FileLoadAction.java
Index: FileLoadAction.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/FileLoadAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FileLoadAction.java 22 May 2004 01:17:01 -0000 1.10
+++ FileLoadAction.java 23 May 2004 16:15:05 -0000 1.11
@@ -58,22 +58,10 @@
private boolean remoteURL = false;
public FileLoadAction(
- LogUI parent, String decoder, String title, boolean isRemoteURL) {
+ LogUI parent, Decoder decoder, String title, boolean isRemoteURL) {
super(title);
remoteURL = isRemoteURL;
-
- try {
- Class c = Class.forName(decoder);
- Object o = c.newInstance();
-
- if (o instanceof Decoder) {
- this.decoder = (Decoder) o;
- }
- } catch (ClassNotFoundException cnfe) {
- } catch (IllegalAccessException iae) {
- } catch (InstantiationException ie) {
- }
-
+ this.decoder = decoder;
this.parent = parent;
}
1.15 +15 -1
logging-log4j/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
Index: UtilLoggingXMLDecoder.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- UtilLoggingXMLDecoder.java 23 May 2004 07:46:43 -0000 1.14
+++ UtilLoggingXMLDecoder.java 23 May 2004 16:15:05 -0000 1.15
@@ -16,6 +16,7 @@
package org.apache.log4j.xml;
+import java.awt.Component;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
@@ -27,6 +28,7 @@
import java.util.Map;
import java.util.Vector;
+import javax.swing.ProgressMonitorInputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -62,7 +64,13 @@
private Map additionalProperties = new HashMap();
private String partialEvent;
private static final String RECORD_END="</record>";
+ private Component owner = null;
+ public UtilLoggingXMLDecoder(Component owner) {
+ this();
+ this.owner = owner;
+ }
+
public UtilLoggingXMLDecoder() {
dbf = DocumentBuilderFactory.newInstance();
dbf.setValidating(false);
@@ -142,7 +150,12 @@
* @throws IOException
*/
public Vector decode(URL url) throws IOException {
- LineNumberReader reader = new LineNumberReader(new
InputStreamReader(url.openStream()));
+ LineNumberReader reader = null;
+ if (owner != null) {
+ reader = new LineNumberReader(new InputStreamReader(new
ProgressMonitorInputStream(owner, "Loading " + url , url.openStream())));
+ } else {
+ reader = new LineNumberReader(new InputStreamReader(url.openStream()));
+ }
Vector v = new Vector();
String line = null;
@@ -155,6 +168,7 @@
v.addAll(decodeEvents(buffer.toString()));
}
} finally {
+ partialEvent = null;
try {
if (reader != null) {
reader.close();
1.18 +16 -2 logging-log4j/src/java/org/apache/log4j/xml/XMLDecoder.java
Index: XMLDecoder.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/xml/XMLDecoder.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XMLDecoder.java 23 May 2004 07:46:43 -0000 1.17
+++ XMLDecoder.java 23 May 2004 16:15:05 -0000 1.18
@@ -16,6 +16,7 @@
package org.apache.log4j.xml;
+import java.awt.Component;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
@@ -26,6 +27,7 @@
import java.util.Map;
import java.util.Vector;
+import javax.swing.ProgressMonitorInputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -66,7 +68,12 @@
private DocumentBuilder docBuilder;
private Map additionalProperties = new HashMap();
private String partialEvent;
-
+ private Component owner = null;
+
+ public XMLDecoder(Component owner) {
+ this();
+ this.owner = owner;
+ }
public XMLDecoder() {
dbf = DocumentBuilderFactory.newInstance();
dbf.setValidating(false);
@@ -138,7 +145,13 @@
* @throws IOException
*/
public Vector decode(URL url) throws IOException {
- LineNumberReader reader = new LineNumberReader(new
InputStreamReader(url.openStream()));
+ LineNumberReader reader = null;
+ if (owner != null) {
+ reader = new LineNumberReader(new InputStreamReader(new
ProgressMonitorInputStream(owner, "Loading " + url , url.openStream())));
+ } else {
+ reader = new LineNumberReader(new InputStreamReader(url.openStream()));
+ }
+
Vector v = new Vector();
String line = null;
@@ -151,6 +164,7 @@
v.addAll(decodeEvents(buffer.toString()));
}
} finally {
+ partialEvent = null;
try {
if (reader != null) {
reader.close();
1.12 +4 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html
Index: release-notes.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- release-notes.html 23 May 2004 07:46:43 -0000 1.11
+++ release-notes.html 23 May 2004 16:15:06 -0000 1.12
@@ -9,7 +9,10 @@
<h3>1.99.99 (18th May 2004 10:35 GMT+10)</h3>
-
+<h2>23 May 2004</h2>
+<ul>
+ <li>Ongoing work to improve xml decoder. Can now display a progress bar when
processing files.</li>
+</ul>
<h2>21 May 2004</h2>
<ul>
<li>Corrected a bug in XML decoders which caused a Swing exception when rendering
the exception column - discovered by Stephen Pain.</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
