pbwest 2004/03/13 19:12:36
Modified: src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Fop.java
Log:
Fixes to options hierarchy
Revision Changes Path
No revision
No revision
1.1.2.13 +21 -4 xml-fop/src/java/org/apache/fop/apps/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Fop.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- Fop.java 13 Mar 2004 08:44:23 -0000 1.1.2.12
+++ Fop.java 14 Mar 2004 03:12:36 -0000 1.1.2.13
@@ -21,6 +21,7 @@
package org.apache.fop.apps;
//import java.util.logging.Handler;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
@@ -28,9 +29,11 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.fop.configuration.*;
+import org.apache.fop.configuration.CLI_Options;
import org.apache.fop.configuration.ConfigurationResource;
import org.apache.fop.configuration.Configuration;
+import org.apache.fop.configuration.SystemOptions;
+import org.apache.fop.configuration.UserOptions;
public class Fop {
@@ -111,6 +114,8 @@
logger.setLevel(Level.WARNING);
Driver driver;
SystemOptions options = null;
+ UserOptions userOptions = null;
+ CLI_Options cliOptions = null;
Boolean bool = null;
runtime = Runtime.getRuntime();
@@ -121,9 +126,21 @@
try {
configuration = new Configuration();
if (args == null) {
- options = new UserOptions(configuration);
+ userOptions = new UserOptions(configuration);
+ options = userOptions;
+ try {
+ userOptions.configure();
+ } catch (FileNotFoundException e2) {
+ throw new FOPException(e2);
+ }
} else {
- options = new CLI_Options(configuration, args);
+ cliOptions = new CLI_Options(configuration, args);
+ options = cliOptions;
+ try {
+ cliOptions.configure(args);
+ } catch (FileNotFoundException e2) {
+ throw new FOPException(e2);
+ }
}
driver = new Driver(configuration, options);
driver.run();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
