gmazza 2003/08/04 11:53:17
Modified: src/java/org/apache/fop/apps AWTStarter.java
CommandLineOptions.java
Log:
1) Command-line option -l now sets default locale for entire instance, not just that
of AWTRenderer.
2) (minor) CommandLineOptions.getInputHandler() returns error if input mode not
properly set.
Revision Changes Path
1.6 +1 -7 xml-fop/src/java/org/apache/fop/apps/AWTStarter.java
Index: AWTStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/AWTStarter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AWTStarter.java 27 Jul 2003 16:37:13 -0000 1.5
+++ AWTStarter.java 4 Aug 2003 18:53:17 -0000 1.6
@@ -87,13 +87,7 @@
}
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);
1.10 +3 -12 xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CommandLineOptions.java 29 Jul 2003 22:08:54 -0000 1.9
+++ CommandLineOptions.java 4 Aug 2003 18:53:17 -0000 1.10
@@ -53,6 +53,7 @@
// 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 @@
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 @@
|| (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 @@
case XSLT_INPUT:
return new XSLTInputHandler(xmlfile, xsltfile);
default:
- return new FOInputHandler(fofile);
+ throw new FOPException("Invalid inputmode setting!");
}
}
@@ -562,14 +561,6 @@
*/
public File getUserConfigFile() {
return userConfigFile;
- }
-
- /**
- * Returns the default language
- * @return the default language
- */
- public String getLanguage() {
- return language;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
