You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2004/01/25 03:19:02 UTC
cvs commit: xml-fop/src/java/org/apache/fop/configuration Configuration.java ConfigurationReader.java ConfigurationParser.java
pbwest 2004/01/24 18:19:02
Modified: src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design Configuration.java
ConfigurationReader.java ConfigurationParser.java
Log:
Switch to java.util.logging
Revision Changes Path
No revision
No revision
1.1.2.4 +16 -15 xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java
Index: Configuration.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Configuration.java 5 Jan 2004 02:21:37 -0000 1.1.2.3
+++ Configuration.java 25 Jan 2004 02:19:02 -0000 1.1.2.4
@@ -55,7 +55,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.fop.messaging.MessageHandler;
+import java.util.logging.Logger;
/**
* a configuration class for all general configuration aspects except those
@@ -66,6 +66,7 @@
*/
public class Configuration {
+ protected static final Logger logger = Logger.getLogger("org.apache.fop");
/**
* defines role types
*/
@@ -348,7 +349,7 @@
awtConfiguration = config;
break;
default:
- MessageHandler.errorln(
+ logger.warning(
"Can't setup configuration. Unknown configuration role/target"
);
}
@@ -375,7 +376,7 @@
break;
default:
standardConfiguration.put(key, value);
- MessageHandler.errorln("Unknown role for new configuration entry."
+ logger.warning("Unknown role for new configuration entry."
+ " Putting key:" + key + " - value:"
+ value + " into standard configuration.");
}
@@ -410,38 +411,38 @@
standardConfiguration, pdfConfiguration, awtConfiguration
};
for (int i = 0; i < configs.length; i++) {
- MessageHandler.logln("----------------------");
+ logger.config("----------------------");
configuration = configs[i];
Iterator iter = configuration.keySet().iterator();
while (iter.hasNext()) {
key = (String)iter.next();
- MessageHandler.logln("key: " + key);
+ logger.config("key: " + key);
value = configuration.get(key);
if (value instanceof String) {
- MessageHandler.logln(" value: " + value);
+ logger.config(" value: " + value);
} else if (value instanceof Boolean) {
- MessageHandler.logln
+ logger.config
(" value: " + ((Boolean)value).booleanValue());
} else if (value instanceof Integer) {
- MessageHandler.logln
+ logger.config
(" value: " + ((Integer)value).intValue());
} else if (value instanceof ArrayList) {
list = (ArrayList)value;
iterator = list.iterator();
- MessageHandler.log(" values: ");
+ StringBuffer msg = new StringBuffer(" values: ");
while (iterator.hasNext()) {
- MessageHandler.log(iterator.next() + " - ");
+ msg.append(iterator.next() + " - ");
}
- MessageHandler.logln("");
+ logger.config(msg.toString());
} else if (value instanceof HashMap) {
map = (HashMap)value;
iterator = map.keySet().iterator();
- MessageHandler.log(" values: ");
+ StringBuffer msg = new StringBuffer(" values: ");
while (iterator.hasNext()) {
tmp = (String)iterator.next();
- MessageHandler.log(" " + tmp + ":" + map.get(tmp));
+ msg.append(" " + tmp + ":" + map.get(tmp));
}
- MessageHandler.logln("");
+ logger.config(msg.toString());
}
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationReader.java
Index: ConfigurationReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationReader.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ConfigurationReader.java 17 Jul 2003 23:56:15 -0000 1.1.2.2
+++ ConfigurationReader.java 25 Jan 2004 02:19:02 -0000 1.1.2.3
@@ -59,7 +59,6 @@
// fop
import org.apache.fop.apps.Driver;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.apps.FOPException;
/**
@@ -136,7 +135,8 @@
public static XMLReader createParser() throws FOPException {
String parserClassName = Driver.getParserClassName();
if (errorDump) {
- MessageHandler.logln("configuration reader using SAX parser "
+ Configuration.logger.config(
+ "configuration reader using SAX parser "
+ parserClassName);
}
1.1.2.2 +3 -6 xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java
Index: ConfigurationParser.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ConfigurationParser.java 5 Jul 2003 19:05:39 -0000 1.1.2.1
+++ ConfigurationParser.java 25 Jan 2004 02:19:02 -0000 1.1.2.2
@@ -62,9 +62,6 @@
import java.util.HashMap;
import java.util.ArrayList;
-// fop
-import org.apache.fop.messaging.MessageHandler;
-
/**
* SAX2 Handler which retrieves the configuration information and stores them in Configuration.
@@ -190,7 +187,7 @@
fontTriplets.add(fontTriplet);
} else {
// to make sure that user knows about false tag
- MessageHandler.errorln("Unknown tag in configuration file: "
+ Configuration.logger.warning("Unknown tag in configuration file: "
+ localName);
}
} // end startElement
@@ -297,7 +294,7 @@
if (activeConfiguration != null) {
activeConfiguration.put(key, value);
} else {
- MessageHandler.errorln("Unknown role >" + role
+ Configuration.logger.warning("Unknown role >" + role
+ "< for new configuration entry. \n"
+ "Putting configuration with key:" + key
+ " into standard configuration.");
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org