Moved the Translator (resource bundle) creation from AWTStarter to AWTRenderer.

Gave the AWTRenderer access to the PrintViewer frame that displays the document.
Moved rendering status messages from AWTStarter to AWTRenderer and PrintDialog.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196779 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 f3caeb1c642f51f52520e82fde774a28af33e889..8fbdd2e73273a185d8a1a709487cbcdd23c0cfe0 100644 (file)
--- a/src/java/org/apache/fop/apps/AWTStarter.java
+++ b/src/java/org/apache/fop/apps/AWTStarter.java
@@ -53,14 +53,12 @@ package org.apache.fop.apps;
 //FOP
 import org.apache.fop.render.awt.AWTRenderer;
 import org.apache.fop.viewer.PreviewDialog;
-import org.apache.fop.viewer.Translator;
 
 //Java
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.Locale;
 
 /**
  * AWT Viewer starter.
@@ -72,7 +70,6 @@ import java.util.Locale;
  */
 public class AWTStarter extends CommandLineStarter {
     private PreviewDialog frame;
-    private Translator translator;
     private Driver driver;
 
     /**
@@ -87,10 +84,9 @@ public class AWTStarter extends CommandLineStarter {
     }
 
     private void init() throws FOPException {
-        translator = new Translator();
-        AWTRenderer renderer = new AWTRenderer(translator);
-        frame = createPreviewDialog(renderer, translator);
-        renderer.setComponent(frame);
+        AWTRenderer renderer = new AWTRenderer();
+        frame = createPreviewDialog(renderer);
+        renderer.setPreviewDialog(frame);
         renderer.setOptions(commandLineOptions.getRendererOptions());
         driver = new Driver();
         driver.setRenderer(renderer);
@@ -103,18 +99,14 @@ public class AWTStarter extends CommandLineStarter {
     public void run() throws FOPException {
         driver.reset();
         try {
-            frame.setStatus(translator.getString("Status.Build.FO.tree"));
             driver.render(inputHandler);
-            frame.setStatus(translator.getString("Status.Show"));
-            frame.showPage();
         } catch (Exception e) {
             frame.reportException(e);
         }
     }
 
-    private PreviewDialog createPreviewDialog(AWTRenderer renderer,
-            Translator res) {
-        PreviewDialog frame = new PreviewDialog(this, renderer, res);
+    private PreviewDialog createPreviewDialog(AWTRenderer renderer) {
+        PreviewDialog frame = new PreviewDialog(this, renderer);
         frame.addWindowListener(new WindowAdapter() {
             public void windowClosed(WindowEvent we) {
                 System.exit(0);

diff --git a/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java b/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java
index 189ec1481fc2d6944dce52ccbfcd9acf0b1d369f..9e2510caa32525baae1d699f16ae46c8413ceb54 100644 (file)
--- a/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java
+++ b/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java
@@ -68,7 +68,7 @@ public class AWTPrintRenderer extends AWTRenderer {
     private PrinterJob printerJob;
 
     public AWTPrintRenderer() {
-        super(null);
+        super();
         initialize();
     }
 

diff --git a/src/java/org/apache/fop/render/awt/AWTRenderer.java b/src/java/org/apache/fop/render/awt/AWTRenderer.java
index d4700233a07a61bb7e6a280fe1c938102dc23f04..d46fca1572c4d6f9bef96e794bdf27a7b70d2455 100644 (file)
--- a/src/java/org/apache/fop/render/awt/AWTRenderer.java
+++ b/src/java/org/apache/fop/render/awt/AWTRenderer.java
@@ -72,6 +72,7 @@ import java.util.Map;
 
 import org.apache.fop.layout.FontInfo;
 import org.apache.fop.render.AbstractRenderer;
+import org.apache.fop.viewer.PreviewDialog;
 import org.apache.fop.viewer.Translator;
 
 /**
@@ -85,7 +86,11 @@ public class AWTRenderer extends AbstractRenderer implements Printable, Pageable
     protected int pageNumber = 0;
     protected List pageList = new java.util.Vector();
     //protected ProgressListener progressListener = null;
-    protected Translator res = null;
+
+    /**
+     * The resource bundle used for AWT messages.
+     */
+    protected Translator translator = null;
 
     protected Map fontNames = new java.util.Hashtable();
     protected Map fontStyles = new java.util.Hashtable();
@@ -100,7 +105,7 @@ public class AWTRenderer extends AbstractRenderer implements Printable, Pageable
 
     /**
      * The current (internal) font name
-     */
+    */
     protected String currentFontName;
 
     /**
@@ -116,14 +121,18 @@ public class AWTRenderer extends AbstractRenderer implements Printable, Pageable
     protected float currentBlue = 0;
 
     /**
-     * The parent component, used to set up the font.
-     * This is needed as FontSetup needs a live AWT component
-     * in order to generate valid font measures.
+     * The preview dialog frame used for display of the documents.
+     * Also used as the AWT Component for FontSetup in generating
+     * valid font measures.
      */
-    protected Component parent;
+    protected PreviewDialog frame;
+    
+    public AWTRenderer() {
+        translator = new Translator();
+    }
 
-    public AWTRenderer(Translator aRes) {
-        res = aRes;
+    public Translator getTranslator() {
+        return translator;
     }
 
     public int getPageCount() {
@@ -138,13 +147,12 @@ public class AWTRenderer extends AbstractRenderer implements Printable, Pageable
     }
 
     /**
-     * Sets parent component which is  used to set up the font.
-     * This is needed as FontSetup needs a live AWT component
-     * in order to generate valid font measures.
-     * @param parent the live AWT component reference
+     * Sets the preview dialog frame used for display of the documents.
+     * @param frame the PreviewDialog frame
      */
-    public void setComponent(Component parent) {
-        this.parent = parent;
+    public void setPreviewDialog(PreviewDialog frame) {
+        this.frame = frame;
+        frame.setStatus(translator.getString("Status.Build.FO.tree"));
     }
 
     public int getPageNumber() {
@@ -173,6 +181,8 @@ public class AWTRenderer extends AbstractRenderer implements Printable, Pageable
 
     public void stopRenderer()
     throws IOException {
+        frame.setStatus(translator.getString("Status.Show"));
+        frame.showPage();
     }
 
     // Printable Interface

diff --git a/src/java/org/apache/fop/viewer/PreviewDialog.java b/src/java/org/apache/fop/viewer/PreviewDialog.java
index 9a3ef6cbd3a20692e6811bc4324268fb42ffc4e0..ab6d71e1614484f00a1838807bdb9c7e3bc06078 100644 (file)
--- a/src/java/org/apache/fop/viewer/PreviewDialog.java
+++ b/src/java/org/apache/fop/viewer/PreviewDialog.java
@@ -106,24 +106,22 @@ public class PreviewDialog extends JFrame {
     private JLabel infoStatus;
 
     /**
-     *  Creates a new PreviewDialog that uses the given starter, renderer and translator.
+     *  Creates a new PreviewDialog that uses the given starter and renderer.
      *  @param aStarter the to use starter
      *  @param aRenderer the to use renderer
-     *  @param aRes the to use translator
      */
-    public PreviewDialog(AWTStarter aStarter, AWTRenderer aRenderer, Translator aRes) {
-        this(aRenderer, aRes);
+    public PreviewDialog(AWTStarter aStarter, AWTRenderer aRenderer) {
+        this(aRenderer);
         starter = aStarter;
     }
 
     /**
-     * Creates a new PreviewDialog that uses the given renderer and translator.
+     * Creates a new PreviewDialog that uses the given renderer.
      * @param aRenderer the to use renderer
-     * @param aRes the to use translator
      */
-    public PreviewDialog(AWTRenderer aRenderer, Translator aRes) {
-        translator = aRes;
+    public PreviewDialog(AWTRenderer aRenderer) {
         renderer = aRenderer;
+        translator = renderer.getTranslator();
 
         //Commands aka Actions
         Command printAction = new Command(translator.getString("Menu.Print"), "Print") {
@@ -424,7 +422,9 @@ public class PreviewDialog extends JFrame {
             //while (renderer.getPageCount() != 0)
             //    renderer.removePage(0);
             try {
+                setStatus(translator.getString("Status.Build.FO.tree"));
                 starter.run();
+                setStatus(translator.getString("Status.Show"));
             } catch (FOPException e) {
                 reportException(e);
             }