pbwest 2004/03/13 00:41:30
Modified: src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design ConfigurationParser.java
Added: src/java/org/apache/fop/configuration Tag:
FOP_0-20-0_Alt-Design FOPOptions.java
SystemOptions.java CLI_Options.java
UserOptions.java FOUserAgent.java
Log:
Reconstructed FOPOptions as:
SystemOptions
UserOptions extends SystemOptions
CLI_Options extends UserOptions
Moved all configuration-related classes into org.apache.fop.configuration
Revision Changes Path
No revision
No revision
1.1.2.6 +7 -1
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ConfigurationParser.java 8 Mar 2004 21:40:41 -0000 1.1.2.5
+++ ConfigurationParser.java 13 Mar 2004 08:41:29 -0000 1.1.2.6
@@ -265,6 +265,12 @@
private void store(String role, String key, Object value) {
activeConfiguration = (HashMap)configMaps.get(role);
if (activeConfiguration != null) {
+ Object val;
+ if ((val = activeConfiguration.get(key)) != null) {
+ configuration.logger.config(
+ "Existing value for key " + key + ":"
+ + val.toString() + " overrides " + value.toString());
+ }
activeConfiguration.put(key, value);
} else {
configuration.logger.warning("Unknown role >" + role
No revision
Index: ConfigurationParser.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ConfigurationParser.java 8 Mar 2004 21:40:41 -0000 1.1.2.5
+++ ConfigurationParser.java 13 Mar 2004 08:41:29 -0000 1.1.2.6
@@ -265,6 +265,12 @@
private void store(String role, String key, Object value) {
activeConfiguration = (HashMap)configMaps.get(role);
if (activeConfiguration != null) {
+ Object val;
+ if ((val = activeConfiguration.get(key)) != null) {
+ configuration.logger.config(
+ "Existing value for key " + key + ":"
+ + val.toString() + " overrides " + value.toString());
+ }
activeConfiguration.put(key, value);
} else {
configuration.logger.warning("Unknown role >" + role
No revision
Index: ConfigurationParser.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/ConfigurationParser.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ConfigurationParser.java 8 Mar 2004 21:40:41 -0000 1.1.2.5
+++ ConfigurationParser.java 13 Mar 2004 08:41:29 -0000 1.1.2.6
@@ -265,6 +265,12 @@
private void store(String role, String key, Object value) {
activeConfiguration = (HashMap)configMaps.get(role);
if (activeConfiguration != null) {
+ Object val;
+ if ((val = activeConfiguration.get(key)) != null) {
+ configuration.logger.config(
+ "Existing value for key " + key + ":"
+ + val.toString() + " overrides " + value.toString());
+ }
activeConfiguration.put(key, value);
} else {
configuration.logger.warning("Unknown role >" + role
1.1.2.1 +1130 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/FOPOptions.java
1.1.2.1 +734 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/SystemOptions.java
1.1.2.1 +359 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/CLI_Options.java
1.1.2.1 +88 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/UserOptions.java
1.1.2.1 +133 -0
xml-fop/src/java/org/apache/fop/configuration/Attic/FOUserAgent.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
