Removed uses of System.out where throwing a FOPException should suffice.

Refactored code to throw FOPExceptions so embedding FOP wont' cause app
server JVMs to exit.
PR:
Obtained from:
Submitted by:
Reviewed by:


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

1 files changed, 22 insertions, 3 deletions

diff --git a/src/org/apache/fop/apps/Fop.java b/src/org/apache/fop/apps/Fop.java
index 727fbbaf3..2f4032deb 100644
--- a/src/org/apache/fop/apps/Fop.java
+++ b/src/org/apache/fop/apps/Fop.java
@@ -7,11 +7,30 @@
 
 package org.apache.fop.apps;
 
+import org.apache.fop.messaging.MessageHandler;
+
 public class Fop {
     public static void main (String [] args) {
-        CommandLineOptions options = new CommandLineOptions (args);
-        Starter starter = options.getStarter();
-        starter.run();
+	CommandLineOptions options = null;
+	
+	try {
+	    options = new CommandLineOptions (args);
+	    Starter starter = options.getStarter();
+	    starter.run();
+	}
+	catch (FOPException e) {
+	    MessageHandler.errorln("ERROR: "+e.getMessage());
+	    if (options != null && options.isDebugMode().booleanValue()) {
+		e.printStackTrace();
+	    }
+	}
+	catch (java.io.FileNotFoundException e) {
+	    MessageHandler.errorln("ERROR: "+e.getMessage());
+	    if (options != null && options.isDebugMode().booleanValue()) {
+		e.printStackTrace();
+	    }
+	}
     }
+    
 }