1.) Moved the business logic for determining which starter to create from apps.Comman...

2.) Made the input and output type constants in CLO public, to make the CLO.getOutputMode() and CLO.getInputMode() accessor functions meaningful.  (Should probably make uniform with the very similar constants in the Driver class in the future.)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196760 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/apps/CommandLineOptions.java b/src/java/org/apache/fop/apps/CommandLineOptions.java
index 51f52ea40d0285df4ef311558a968f5c5e09a248..713f96066cc4f41b119c47696b6ab675b77a510e 100644 (file)
--- a/src/java/org/apache/fop/apps/CommandLineOptions.java
+++ b/src/java/org/apache/fop/apps/CommandLineOptions.java
@@ -64,31 +64,31 @@ import org.apache.avalon.framework.logger.Logger;
 public class CommandLineOptions {
 
     /* input / output not set */
-    private static final int NOT_SET = 0;
+    public static final int NOT_SET = 0;
     /* input: fo file */
-    private static final int FO_INPUT = 1;
+    public static final int FO_INPUT = 1;
     /* input: xml+xsl file */
-    private static final int XSLT_INPUT = 2;
+    public static final int XSLT_INPUT = 2;
     /* output: pdf file */
-    private static final int PDF_OUTPUT = 1;
+    public static final int PDF_OUTPUT = 1;
     /* output: screen using swing */
-    private static final int AWT_OUTPUT = 2;
+    public static final int AWT_OUTPUT = 2;
     /* output: mif file */
-    private static final int MIF_OUTPUT = 3;
+    public static final int MIF_OUTPUT = 3;
     /* output: sent swing rendered file to printer */
-    private static final int PRINT_OUTPUT = 4;
+    public static final int PRINT_OUTPUT = 4;
     /* output: pcl file */
-    private static final int PCL_OUTPUT = 5;
+    public static final int PCL_OUTPUT = 5;
     /* output: postscript file */
-    private static final int PS_OUTPUT = 6;
+    public static final int PS_OUTPUT = 6;
     /* output: text file */
-    private static final int TXT_OUTPUT = 7;
+    public static final int TXT_OUTPUT = 7;
     /* output: svg file */
-    private static final int SVG_OUTPUT = 8;
+    public static final int SVG_OUTPUT = 8;
     /* output: XML area tree */
-    private static final int AREA_OUTPUT = 9;
+    public static final int AREA_OUTPUT = 9;
     /* output: RTF file */
-    private static final int RTF_OUTPUT = 10;
+    public static final int RTF_OUTPUT = 10;
 
     /* show configuration information */
     private Boolean dumpConfiguration = Boolean.FALSE;
@@ -508,30 +508,6 @@ public class CommandLineOptions {
         return rendererOptions;
     }
 
-    /**
-     * Get the starter for the process.
-     * @return the starter.
-     * @throws FOPException In case of failure while getting the starter
-     */
-    public Starter getStarter() throws FOPException {
-        Starter starter = null;
-        switch (outputmode) {
-        case AWT_OUTPUT:
-            try {
-                starter = new AWTStarter(this);
-            } catch (FOPException e) {
-                throw e;
-            } catch (Exception e) {
-                throw new FOPException("AWTStarter could not be loaded.", e);
-            }
-            break;
-        default:
-            starter = new CommandLineStarter(this);
-        }
-        starter.enableLogging(log);
-        return starter;
-    }
-
     /**
      * Returns the input mode (type of input data, ex. NOT_SET or FO_INPUT)
      * @return the input mode

diff --git a/src/java/org/apache/fop/apps/Fop.java b/src/java/org/apache/fop/apps/Fop.java
index a09ef5957b50a188c784da3d8b81f7e7efa0bf76..76ec115f5733dddb71496ef6aa2461d4f6232bbb 100644 (file)
--- a/src/java/org/apache/fop/apps/Fop.java
+++ b/src/java/org/apache/fop/apps/Fop.java
@@ -50,6 +50,8 @@
  */ 
 package org.apache.fop.apps;
 
+import org.apache.avalon.framework.logger.ConsoleLogger;
+
 /**
  * The main application class for the FOP command line interface (CLI).
  */
@@ -61,10 +63,16 @@ public class Fop {
      */
     public static void main(String[] args) {
         CommandLineOptions options = null;
+        Starter starter = null;
 
         try {
             options = new CommandLineOptions(args);
-            Starter starter = options.getStarter();
+            if (options.getOutputMode() == CommandLineOptions.AWT_OUTPUT) {
+                starter = new AWTStarter(options);
+            } else {
+                starter = new CommandLineStarter(options);
+            }
+            starter.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_INFO));
             starter.run();
         } catch (FOPException e) {
             if (e.getMessage() == null) {