From 48a295f5ff14c037a3911620ac0aeab7341d2d29 Mon Sep 17 00:00:00 2001 From: Joerg Pietschmann Date: Sun, 14 Jul 2002 15:23:47 +0000 Subject: [PATCH] Removed traces of buffermanager A few cosmetical changes in CommandLineOptions git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194996 13f79535-47bb-0310-9956-ffa450edef68 --- build.sh | 19 +++++++ .../apache/fop/apps/CommandLineOptions.java | 55 +++++-------------- .../apache/fop/apps/CommandLineStarter.java | 1 - src/org/apache/fop/apps/Driver.java | 5 -- 4 files changed, 33 insertions(+), 47 deletions(-) diff --git a/build.sh b/build.sh index 010989d04..d0a39960f 100755 --- a/build.sh +++ b/build.sh @@ -12,12 +12,31 @@ if [ "$JAVA_HOME" = "" ] ; then echo "location of the Java Virtual Machine you want to use." exit 1 fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +case "`uname`" in + CYGWIN*) cygwin=true ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + LIBDIR=lib LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.3.1.jar:$LIBDIR/xml-apis.jar LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/jimi-1.0.jar:$LIBDIR/avalon-framework-cvs-20020315.jar ANT_HOME=$LIBDIR +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"` +fi + echo echo Building with classpath $LOCALCLASSPATH echo Starting Ant... diff --git a/src/org/apache/fop/apps/CommandLineOptions.java b/src/org/apache/fop/apps/CommandLineOptions.java index a8d3c0872..b2721ccab 100644 --- a/src/org/apache/fop/apps/CommandLineOptions.java +++ b/src/org/apache/fop/apps/CommandLineOptions.java @@ -49,39 +49,31 @@ public class CommandLineOptions { private static final int TXT_OUTPUT = 7; /* output: svg file */ private static final int SVG_OUTPUT = 8; - - /* System buffers */ - private static final int BUFFER_FILE = 8; - - /* System buffers */ + /* output: XML area tree */ private static final int AREA_OUTPUT = 9; /* use debug mode */ - Boolean errorDump = new Boolean(false); + Boolean errorDump = Boolean.FALSE; /* show configuration information */ - Boolean dumpConfiguration = new Boolean(false); + Boolean dumpConfiguration = Boolean.FALSE; /* suppress any progress information */ - Boolean quiet = new Boolean(false); + Boolean quiet = Boolean.FALSE; /* for area tree XML output, only down to block area level */ - Boolean suppressLowLevelAreas = new Boolean(false); - /* name of user configuration file */ + Boolean suppressLowLevelAreas = Boolean.FALSE; + /* user configuration file */ File userConfigFile = null; - /* name of input fo file */ + /* input fo file */ File fofile = null; - /* name of xsltfile (xslt transformation as input) */ + /* xsltfile (xslt transformation as input) */ File xsltfile = null; - /* name of xml file (xslt transformation as input) */ + /* xml file (xslt transformation as input) */ File xmlfile = null; - /* name of output file */ + /* output file */ File outfile = null; - /* name of buffer file */ - File bufferFile = null; /* input mode */ int inputmode = NOT_SET; /* output mode */ int outputmode = NOT_SET; - /* buffer mode */ - int buffermode = NOT_SET; /* language for user information */ String language = null; @@ -122,13 +114,13 @@ public class CommandLineOptions { private boolean parseOptions(String args[]) throws FOPException { for (int i = 0; i < args.length; i++) { if (args[i].equals("-d") || args[i].equals("--full-error-dump")) { - errorDump = new Boolean(true); + errorDump = Boolean.TRUE; log = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG); } else if (args[i].equals("-x") || args[i].equals("--dump-config")) { - dumpConfiguration = new Boolean(true); + dumpConfiguration = Boolean.TRUE; } else if (args[i].equals("-q") || args[i].equals("--quiet")) { - quiet = new Boolean(true); + quiet = Boolean.TRUE; log = new ConsoleLogger(ConsoleLogger.LEVEL_ERROR); } else if (args[i].equals("-c")) { if ((i + 1 == args.length) @@ -147,7 +139,7 @@ public class CommandLineOptions { i++; } } else if (args[i].equals("-s")) { - suppressLowLevelAreas = new Boolean(true); + suppressLowLevelAreas = Boolean.TRUE; } else if (args[i].equals("-fo")) { inputmode = FO_INPUT; if ((i + 1 == args.length) @@ -250,21 +242,6 @@ public class CommandLineOptions { throw new FOPException("Don't know what to do with " + args[i]); } - } else if (args[i].equals("-buf")) { - if (buffermode == NOT_SET) { - buffermode = BUFFER_FILE; - } else { - log.error("you can only set one buffer method"); - printUsage(); - } - if ((i + 1 == args.length) - || (args[i + 1].charAt(0) == '-')) { - log.error("you must specify the buffer output file"); - printUsage(); - } else { - bufferFile = new File(args[i + 1]); - i++; - } } else if (args[i].equals("-at")) { setOutputMode(AREA_OUTPUT); if ((i + 1 == args.length) @@ -467,10 +444,6 @@ public class CommandLineOptions { return language; } - public File getBufferFile() { - return bufferFile; - } - public Boolean isQuiet() { return quiet; } diff --git a/src/org/apache/fop/apps/CommandLineStarter.java b/src/org/apache/fop/apps/CommandLineStarter.java index c38e3dd26..03c1eb0a4 100644 --- a/src/org/apache/fop/apps/CommandLineStarter.java +++ b/src/org/apache/fop/apps/CommandLineStarter.java @@ -54,7 +54,6 @@ public class CommandLineStarter extends Starter { Driver driver = new Driver(); driver.setLogger(log); - driver.setBufferFile(commandLineOptions.getBufferFile()); driver.initialize(); if (errorDump) { diff --git a/src/org/apache/fop/apps/Driver.java b/src/org/apache/fop/apps/Driver.java index 899be77c5..730ad1bf0 100644 --- a/src/org/apache/fop/apps/Driver.java +++ b/src/org/apache/fop/apps/Driver.java @@ -528,11 +528,6 @@ public class Driver { } } - /* Set up the system buffers */ - - public void setBufferFile(File bufferFile) { - } - /** * Runs the formatting and renderering process using the previously set * inputsource and outputstream -- 2.39.5