gmazza 2003/08/12 14:36:43
Modified: src/java/org/apache/fop/apps CommandLineStarter.java
Fop.java
src/java/org/apache/fop/tools/anttasks Fop.java
Removed: src/java/org/apache/fop/apps Starter.java
Log:
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.)
Revision Changes Path
1.7 +8 -2 xml-fop/src/java/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandLineStarter.java 11 Aug 2003 23:47:22 -0000 1.6
+++ CommandLineStarter.java 12 Aug 2003 21:36:43 -0000 1.7
@@ -54,6 +54,9 @@
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 @@
*
* Modified to use new streaming API by Mark Lillywhite, [EMAIL PROTECTED]
*/
-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 CommandLineStarter(CommandLineOptions commandLineOptions)
throws FOPException {
this.commandLineOptions = commandLineOptions;
- super.setInputHandler(commandLineOptions.getInputHandler());
+ inputHandler = commandLineOptions.getInputHandler();
}
/**
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Fop.java 11 Aug 2003 23:47:22 -0000 1.3
+++ Fop.java 12 Aug 2003 21:36:43 -0000 1.4
@@ -63,7 +63,7 @@
*/
public static void main(String[] args) {
CommandLineOptions options = null;
- Starter starter = null;
+ CommandLineStarter starter = null;
try {
options = new CommandLineOptions(args);
1.8 +3 -3 xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/anttasks/Fop.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Fop.java 12 Aug 2003 21:17:44 -0000 1.7
+++ Fop.java 12 Aug 2003 21:36:43 -0000 1.8
@@ -66,7 +66,6 @@
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.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 @@
}
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 @@
}
-class FOPTaskStarter extends Starter {
+class FOPTaskStarter extends AbstractLogEnabled {
private Fop task;
private String baseURL = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
