1) Command-line option -l now sets default locale for entire instance, not just that...

2) (minor) CommandLineOptions.getInputHandler() returns error if input mode not properly set.

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

diff --git a/src/java/org/apache/fop/apps/AWTStarter.java b/src/java/org/apache/fop/apps/AWTStarter.java
index caf6bd39bab48f950117e779cf0c5a1cbd2fd111..e7dd49240e50265a2526ec380ad64a7de2b5d921 100644 (file)
--- a/src/java/org/apache/fop/apps/AWTStarter.java
+++ b/src/java/org/apache/fop/apps/AWTStarter.java
@@ -87,13 +87,7 @@ public class AWTStarter extends CommandLineStarter {
     }
 
     private void init() throws FOPException {
-        //Creates Translator according to the language
-        String language = commandLineOptions.getLanguage();
-        if (language == null) {
-            translator = new Translator(Locale.getDefault());
-        } else {
-            translator = new Translator(new Locale(language, ""));
-        }
+        translator = new Translator();
         AWTRenderer renderer = new AWTRenderer(translator);
         frame = createPreviewDialog(renderer, translator);
         renderer.setComponent(frame);

diff --git a/src/java/org/apache/fop/apps/CommandLineOptions.java b/src/java/org/apache/fop/apps/CommandLineOptions.java
index 713f96066cc4f41b119c47696b6ab675b77a510e..264b6dd38752b81ec3e473eff96cacceaa2d5ca5 100644 (file)
--- a/src/java/org/apache/fop/apps/CommandLineOptions.java
+++ b/src/java/org/apache/fop/apps/CommandLineOptions.java
@@ -53,6 +53,7 @@ package org.apache.fop.apps;
 // java
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.util.Locale;
 
 // Avalon
 import org.apache.avalon.framework.logger.ConsoleLogger;
@@ -110,8 +111,6 @@ public class CommandLineOptions {
     private int inputmode = NOT_SET;
     /* output mode */
     private int outputmode = NOT_SET;
-    /* language for user information */
-    private String language = null;
 
     private java.util.HashMap rendererOptions;
 
@@ -233,7 +232,7 @@ public class CommandLineOptions {
                 || (args[i + 1].charAt(0) == '-')) {
             throw new FOPException("if you use '-l', you must specify a language");
         } else {
-            language = args[i + 1];
+            Locale.setDefault(new Locale(args[i + 1], ""));
             return 1;
         }
     }
@@ -496,7 +495,7 @@ public class CommandLineOptions {
         case XSLT_INPUT:
             return new XSLTInputHandler(xmlfile, xsltfile);
         default:
-            return new FOInputHandler(fofile);
+            throw new FOPException("Invalid inputmode setting!");
         }
     }
 
@@ -564,14 +563,6 @@ public class CommandLineOptions {
         return userConfigFile;
     }
 
-    /**
-     * Returns the default language
-     * @return the default language
-     */
-    public String getLanguage() {
-        return language;
-    }
-
     /**
      * Indicates if FOP should be silent.
      * @return true if should be silent