1. FOPTaskStarter separated from Starter class (was not using latter's InputHandler).

2. CommandLineStarter made a top-level class, and abstract Starter class removed.
(only one starter being used for command line, regardless of renderer.)

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

diff --git a/src/java/org/apache/fop/apps/CommandLineStarter.java b/src/java/org/apache/fop/apps/CommandLineStarter.java
index 43f324211d25e5ee0503358bb7c5ebd117f4e35e..cb7166525eeaff84cd8a78a3158748e65af28dff 100644 (file)
--- a/src/java/org/apache/fop/apps/CommandLineStarter.java
+++ b/src/java/org/apache/fop/apps/CommandLineStarter.java
@@ -54,6 +54,9 @@ package org.apache.fop.apps;
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 
+// Avalon
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
 // FOP
 import org.apache.fop.render.awt.AWTRenderer;
 
@@ -62,11 +65,14 @@ import org.apache.fop.render.awt.AWTRenderer;
  *
  * Modified to use new streaming API by Mark Lillywhite, mark-fop@inomial.com
  */
-public class CommandLineStarter extends Starter {
+public class CommandLineStarter extends AbstractLogEnabled {
 
     /** the command-line options associated with this starter */
     protected CommandLineOptions commandLineOptions;
 
+    /** InputHandler associated with this Starter */
+    protected InputHandler inputHandler;
+
     /**
      * Main constructor
      * @param commandLineOptions command-line options to use
@@ -75,7 +81,7 @@ public class CommandLineStarter extends Starter {
     public CommandLineStarter(CommandLineOptions commandLineOptions)
                 throws FOPException {
         this.commandLineOptions = commandLineOptions;
-        super.setInputHandler(commandLineOptions.getInputHandler());
+        inputHandler = commandLineOptions.getInputHandler();
     }
 
     /**

diff --git a/src/java/org/apache/fop/apps/Fop.java b/src/java/org/apache/fop/apps/Fop.java
index 5cd55638c1c848518398107d75dba0f57843698c..d7e432efb5e6abae1418ef40f191f57a3a76fabd 100644 (file)
--- a/src/java/org/apache/fop/apps/Fop.java
+++ b/src/java/org/apache/fop/apps/Fop.java
@@ -63,7 +63,7 @@ public class Fop {
      */
     public static void main(String[] args) {
         CommandLineOptions options = null;
-        Starter starter = null;
+        CommandLineStarter starter = null;
 
         try {
             options = new CommandLineOptions(args);

diff --git a/src/java/org/apache/fop/apps/Starter.java b/src/java/org/apache/fop/apps/Starter.java
deleted file mode 100644 (file)
index 6765056..0000000
--- a/src/java/org/apache/fop/apps/Starter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * $Id: Starter.java,v 1.12 2003/02/27 10:13:07 jeremias Exp $
- * ============================================================================
- *                    The Apache Software License, Version 1.1
- * ============================================================================
- * 
- * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * 3. The end-user documentation included with the redistribution, if any, must
- *    include the following acknowledgment: "This product includes software
- *    developed by the Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself, if
- *    and wherever such third-party acknowledgments normally appear.
- * 
- * 4. The names "FOP" and "Apache Software Foundation" must not be used to
- *    endorse or promote products derived from this software without prior
- *    written permission. For written permission, please contact
- *    apache@apache.org.
- * 
- * 5. Products derived from this software may not be called "Apache", nor may
- *    "Apache" appear in their name, without prior written permission of the
- *    Apache Software Foundation.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ============================================================================
- * 
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation and was originally created by
- * James Tauber <jtauber@jtauber.com>. For more information on the Apache
- * Software Foundation, please see <http://www.apache.org/>.
- */ 
-package org.apache.fop.apps;
-
-// Avalon
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
-/**
- * Abstract super class.
- * Creates a SAX Parser (defaulting to Xerces).
- */
-public abstract class Starter extends AbstractLogEnabled {
-
-    /** InputHandler associated with this Starter */
-    protected InputHandler inputHandler;
-
-    /**
-     * Main constructor
-     * @throws FOPException In case of a problem constructing the Starter
-     */
-    public Starter() throws FOPException {
-    }
-
-    /**
-     * Sets the InputHandler to use.
-     * @param inputHandler input handler
-     */
-    public void setInputHandler(InputHandler inputHandler) {
-        this.inputHandler = inputHandler;
-    }
-
-    /**
-     * Runs the current setup.
-     * @throws FOPException In case of a problem during the FOP run
-     */
-    public abstract void run() throws FOPException;
-
-}

diff --git a/src/java/org/apache/fop/tools/anttasks/Fop.java b/src/java/org/apache/fop/tools/anttasks/Fop.java
index db388f46166c9eb49818998ba1d6e2ecbd8e60b0..b28cc0dca1c21d6eb00935bdfd08a5cd31933a5b 100644 (file)
--- a/src/java/org/apache/fop/tools/anttasks/Fop.java
+++ b/src/java/org/apache/fop/tools/anttasks/Fop.java
@@ -66,7 +66,6 @@ import java.net.MalformedURLException;
 import java.util.List;
 
 // FOP
-import org.apache.fop.apps.Starter;
 import org.apache.fop.apps.InputHandler;
 import org.apache.fop.apps.FOFileHandler;
 import org.apache.fop.apps.Driver;
@@ -74,6 +73,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FOUserAgent;
 
 // Avalon
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.avalon.framework.logger.Logger;
 
@@ -299,7 +299,7 @@ public class Fop extends Task {
         }
         Logger log = new ConsoleLogger(logLevel);
         try {
-            Starter starter = new FOPTaskStarter(this);
+            FOPTaskStarter starter = new FOPTaskStarter(this);
             starter.enableLogging(log);
             starter.run();
         } catch (FOPException ex) {
@@ -310,7 +310,7 @@ public class Fop extends Task {
 
 }
 
-class FOPTaskStarter extends Starter {
+class FOPTaskStarter extends AbstractLogEnabled {
 
     private Fop task;
     private String baseURL = null;