pbwest      2004/03/13 00:44:23

  Modified:    src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
                        Driver.java Fop.java Document.java
  Removed:     src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
                        FOUserAgent.java FOPOptions.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.9.2.14  +6 -4      xml-fop/src/java/org/apache/fop/apps/Driver.java
  
  Index: Driver.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
  retrieving revision 1.9.2.13
  retrieving revision 1.9.2.14
  diff -u -r1.9.2.13 -r1.9.2.14
  --- Driver.java       10 Mar 2004 06:24:29 -0000      1.9.2.13
  +++ Driver.java       13 Mar 2004 08:44:23 -0000      1.9.2.14
  @@ -28,6 +28,8 @@
   import org.xml.sax.XMLReader;
   
   import org.apache.fop.configuration.Configuration;
  +import org.apache.fop.configuration.FOUserAgent;
  +import org.apache.fop.configuration.SystemOptions;
   import org.apache.fop.fo.FOTree;
   import org.apache.fop.layout.AreaTree;
   import org.apache.fop.render.Renderer;
  @@ -74,7 +76,7 @@
       /** If true, full error stacks are reported */
       private boolean _errorDump = false;
       private Configuration configuration = null;
  -    private FOPOptions options = null;
  +    private SystemOptions options = null;
       private FOUserAgent userAgent = null;
       
       private InputHandler inputHandler;
  @@ -107,13 +109,13 @@
       public Driver() {
           String version = Version.getVersion();
           configuration = new Configuration();
  -        options = new FOPOptions(configuration);
  +        options = new SystemOptions(configuration);
           userAgent = new FOUserAgent();
           _errorDump = configuration.isTrue("debugMode");
           logger.config(version);
       }
       
  -    public Driver(Configuration config, FOPOptions options) {
  +    public Driver(Configuration config, SystemOptions options) {
           String version = Version.getVersion();
           configuration = config;
           this.options = options;
  
  
  
  1.1.2.12  +10 -8     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.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- Fop.java  10 Mar 2004 06:24:29 -0000      1.1.2.11
  +++ Fop.java  13 Mar 2004 08:44:23 -0000      1.1.2.12
  @@ -25,8 +25,10 @@
   import java.io.InputStream;
   import java.util.Enumeration;
   import java.util.Properties;
  +import java.util.logging.Level;
   import java.util.logging.Logger;
   
  +import org.apache.fop.configuration.*;
   import org.apache.fop.configuration.ConfigurationResource;
   import org.apache.fop.configuration.Configuration;
   
  @@ -44,12 +46,12 @@
        */
       public static final String fopPackage = "org.apache.fop";
       
  -    private static Logger logger;
  +    private Logger logger;
       
  -    public Configuration configuration = new Configuration();
  +    public Configuration configuration = null;
   
       public static void main(String[] args) {
  -        Fop fopInstance = new Fop();
  +        Fop fopInstance = new Fop(args);
           fopInstance.run();
       }
   
  @@ -106,9 +108,9 @@
           // Now that the Fop system properties have been added, set up logger
           logger = Logger.getLogger(fopPackage);
           // Then restrict to WARNING
  +        logger.setLevel(Level.WARNING);
           Driver driver;
  -        Configuration configuration;
  -        FOPOptions options = null;
  +        SystemOptions options = null;
           Boolean bool = null;
   
           runtime = Runtime.getRuntime();
  @@ -119,9 +121,9 @@
           try {
               configuration = new Configuration();
               if (args == null) {
  -                options = new FOPOptions(configuration);
  +                options = new UserOptions(configuration);
               } else {
  -                options = new FOPOptions(configuration, args);
  +                options = new CLI_Options(configuration, args);
               }
               driver = new Driver(configuration, options);
               driver.run();
  
  
  
  1.11.2.2  +2 -2      xml-fop/src/java/org/apache/fop/apps/Document.java
  
  Index: Document.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- Document.java     10 Mar 2004 06:24:29 -0000      1.11.2.1
  +++ Document.java     13 Mar 2004 08:44:23 -0000      1.11.2.2
  @@ -26,8 +26,8 @@
   
   
   // FOP
  -import org.apache.fop.apps.FOUserAgent;
   
  +import org.apache.fop.configuration.FOUserAgent;
   import org.apache.fop.fonts.Font;
   import org.apache.fop.fonts.FontMetrics;
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to