cvs commit: xml-fop/src/org/apache/fop/viewer/resources Viewer.properties Viewer_cs.properties Viewer_de.properties Viewer_fi.properties Viewer_fr.properties Viewer_it.properties Viewer_ja.properties Viewer_pl.properties Viewer_ru.properties messages.de messages.en resources.de resources.en resources.fi resources.fr resources.it resources.pl resources.ru
keiron 2002/11/06 06:30:16
Modified:src/org/apache/fop/apps AWTStarter.java
src/org/apache/fop/render/awt AWTRenderer.java
src/org/apache/fop/viewer Command.java GoToPageDialog.java
PreviewDialog.java PreviewDialogAboutBox.java
Translator.java
Added: src/org/apache/fop/viewer/Images fop.gif reload.gif
src/org/apache/fop/viewer/resources Viewer.properties
Viewer_cs.properties Viewer_de.properties
Viewer_fi.properties Viewer_fr.properties
Viewer_it.properties Viewer_ja.properties
Viewer_pl.properties Viewer_ru.properties
Removed: src/org/apache/fop/viewer IconToolBar.java
LoadableProperties.java MessageException.java
MessagesDialog.java ProgressListener.java
SecureResourceBundle.java UserMessage.java
src/org/apache/fop/viewer/resources messages.de messages.en
resources.de resources.en resources.fi resources.fr
resources.it resources.pl resources.ru
Log:
awt viewer improvements
uses java PropertyResourceBundle for locale strings
cleaned up code and removed old classes
other small improvements
Submitted by: Oleg Tkachenko [EMAIL PROTECTED]
Revision ChangesPath
1.16 +41 -109 xml-fop/src/org/apache/fop/apps/AWTStarter.java
Index: AWTStarter.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/AWTStarter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AWTStarter.java 25 Oct 2002 09:29:39 - 1.15
+++ AWTStarter.java 6 Nov 2002 14:30:15 - 1.16
@@ -6,136 +6,84 @@
*/
package org.apache.fop.apps;
-/*
- * originally contributed by
- * Juergen Verwohlt: [EMAIL PROTECTED],
- * Rainer Steinkuhle: [EMAIL PROTECTED],
- * Stanislav Gorkhover: [EMAIL PROTECTED]
- * Modified to use streaming API by Mark Lillywhite, [EMAIL PROTECTED]
- */
-import org.apache.fop.viewer.*;
-import org.apache.fop.render.awt.*;
+//FOP
+import org.apache.fop.render.awt.AWTRenderer;
+import org.apache.fop.viewer.PreviewDialog;
+import org.apache.fop.viewer.Translator;
+//Java
import javax.swing.UIManager;
import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.util.Locale;
// SAX
import org.xml.sax.XMLReader;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-
-
-// Java
-import java.io.FileReader;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.*;
-
/**
- * initialize AWT previewer
+ * AWT Viewer starter.
+ * Originally contributed by:
+ * Juergen Verwohlt: [EMAIL PROTECTED],
+ * Rainer Steinkuhle: [EMAIL PROTECTED],
+ * Stanislav Gorkhover: [EMAIL PROTECTED]
+ * Modified to use streaming API by Mark Lillywhite, [EMAIL PROTECTED]
*/
public class AWTStarter extends CommandLineStarter {
+private PreviewDialog frame;
+private Translator translator;
+private Driver driver;
+private XMLReader parser;
-PreviewDialog frame;
-AWTRenderer renderer;
-public static String TRANSLATION_PATH =
-/org/apache/fop/viewer/resources/;
-
-private Translator resource;
-
-public AWTStarter(CommandLineOptions commandLineOptions)
-throws FOPException {
+public AWTStarter(CommandLineOptions commandLineOptions) throws FOPException {
super(commandLineOptions);
init();
}
-private void init() {
-try {
-UIManager.setLookAndFeel(new javax.swing.plaf.metal.MetalLookAndFeel());
-} catch (Exception e) {
-e.printStackTrace();
-}
-
+private void init() throws FOPException {
+//Creates Translator according to the language
String language = commandLineOptions.getLanguage();
-
-if (language == null) {
-try {
-language = System.getProperty(user.language);
-} catch(SecurityException se) {
-// if this is running in a secure place
-}
-}
-resource = getResourceBundle(TRANSLATION_PATH + resources.
- + language);
-
-UserMessage.setTranslator(getResourceBundle(TRANSLATION_PATH
- + messages.
- + language));
-
cvs commit: xml-fop/src/org/apache/fop/viewer/resources Viewer.properties Viewer_cs.properties Viewer_de.properties Viewer_fi.properties Viewer_fr.properties Viewer_it.properties Viewer_ja.properties Viewer_pl.properties Viewer_ru.properties
keiron 2002/11/06 23:44:58 Modified:src/org/apache/fop/viewer/resources Viewer.properties Viewer_cs.properties Viewer_de.properties Viewer_fi.properties Viewer_fr.properties Viewer_it.properties Viewer_ja.properties Viewer_pl.properties Viewer_ru.properties Log: fixed line endings Revision ChangesPath 1.2 +44 -43xml-fop/src/org/apache/fop/viewer/resources/Viewer.properties Index: Viewer.properties === RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/resources/Viewer.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Viewer.properties 6 Nov 2002 14:30:16 - 1.1 +++ Viewer.properties 7 Nov 2002 07:44:58 - 1.2 @@ -1,43 +1,44 @@ -# -# Copyright (C) The Apache Software Foundation. All rights reserved.# -# - # -# This software is published under the terms of the Apache Software License # -# version 1.1, a copy of which has been included with this distribution in # -# the LICENSE file. # -# -# -# AWT viewer's GUI resources. Default bundle. -# -Menu.File=File -Menu.Exit=Exit -Menu.View=View -Menu.First.page=First page -Menu.Prev.page=Previous page -Menu.Next.page=Next page -Menu.Last.page=Last page -Menu.Go.to.Page=Go to Page -Menu.Help=Help -Menu.Default.zoom=Default zoom -Menu.About=About -Menu.Print=Print -Menu.Zoom=Zoom -Menu.Reload=Reload - -Title.Preview=Preview - -Status.Show=Show -Status.Page=Page -Status.of=of -Status.Build.FO.tree=Build FO tree... - -Exception.Occured=An exception has occured -Exception.Error=Fatal error - -Label.Page.number=Page number -Button.Ok=Ok -Button.Cancel=Cancel - -About.Product=FOP AWT Viewer -About.Version=Version: -About.Copyright=See http://xml.apache.org/fop -About.Title=About \ No newline at end of file +# +# Copyright (C) The Apache Software Foundation. All rights reserved.# +# - # +# This software is published under the terms of the Apache Software License # +# version 1.1, a copy of which has been included with this distribution in # +# the LICENSE file. # +# +# +# AWT viewer's GUI resources. Default bundle. +# +Menu.File=File +Menu.Exit=Exit +Menu.View=View +Menu.First.page=First page +Menu.Prev.page=Previous page +Menu.Next.page=Next page +Menu.Last.page=Last page +Menu.Go.to.Page=Go to Page +Menu.Help=Help +Menu.Default.zoom=Default zoom +Menu.About=About +Menu.Print=Print +Menu.Zoom=Zoom +Menu.Reload=Reload + +Title.Preview=Preview + +Status.Show=Show +Status.Page=Page +Status.of=of +Status.Build.FO.tree=Build FO tree... + +Exception.Occured=An exception has occured +Exception.Error=Fatal error + +Label.Page.number=Page number +Button.Ok=Ok +Button.Cancel=Cancel + +About.Product=FOP AWT Viewer +About.Version=Version: +About.Copyright=See http://xml.apache.org/fop +About.Title=About + 1.2 +34 -34xml-fop/src/org/apache/fop/viewer/resources/Viewer_cs.properties Index: Viewer_cs.properties === RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/resources/Viewer_cs.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Viewer_cs.properties 6 Nov 2002 14:30:16 - 1.1 +++ Viewer_cs.properties 7 Nov 2002 07:44:58 - 1.2 @@ -1,34 +1,34 @@ -# -# Copyright (C) The Apache Software Foundation. All rights reserved.# -# - # -# This software is published under the terms of the Apache Software License # -# version 1.1, a copy of which has been included with this distribution in # -# the LICENSE file. # -# -# -# AWT viewer's GUI resources. Czech bundle. -# -Menu.File=Soubor -Menu.Print=Tisk -Menu.Exit=Konec -Menu.View=Zobrazit
