[FOray-commit] SF.net SVN: foray:[10921] trunk/foray

[<vic...@us...>]

Revision: 10921
          http://foray.svn.sourceforge.net/foray/?rev=10921&view=rev
Author:   victormote
Date:     2010-02-02 00:04:40 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
Clean up more logging/error handling.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
    trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java

Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2010-02-01 23:52:06 UTC (rev 10920)
+++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java	2010-02-02 00:04:40 UTC (rev 10921)
@@ -46,6 +46,8 @@
 import org.foray.render.awt.viewer.Translator;
 import org.foray.render.awt.viewer.UserMessage;
 
+import org.axsl.output.OutputException;
+
 import org.apache.commons.logging.Log;
 
 import java.awt.Dimension;
@@ -135,7 +137,11 @@
         final OutputConfig renderOptions =
                 getCommandLineOptions().getRendererOptions();
         this.renderer = new AWTRenderer(this.getLogger(), renderOptions);
-        this.frame = createPreviewDialog(this.renderer, this.resource);
+        try {
+            this.frame = createPreviewDialog(this.renderer, this.resource);
+        } catch (final OutputException e) {
+            throw new FOrayException(e);
+        }
         this.renderer.setComponent(this.frame);
         this.frame.progress(this.resource.getString("Init parser") + " ...");
     }
@@ -161,9 +167,10 @@
      * @param renderer The rendere.
      * @param res The language resources.
      * @return The newly-created preview dialog.
+     * @throws OutputException For errors loading resources.
      */
     protected PreviewDialog createPreviewDialog(final AWTRenderer renderer,
-            final Translator res) {
+            final Translator res) throws OutputException {
         final PreviewDialog frame = new PreviewDialog(renderer, res,
                 getLogger());
         frame.validate();

Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2010-02-01 23:52:06 UTC (rev 10920)
+++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java	2010-02-02 00:04:40 UTC (rev 10921)
@@ -40,6 +40,8 @@
 import org.foray.render.awt.viewer.Translator;
 import org.foray.render.awt.viewer.UserMessage;
 
+import org.axsl.output.OutputException;
+
 import org.xml.sax.InputSource;
 
 import java.awt.Dimension;
@@ -71,10 +73,10 @@
      * @param renderer The Renderer.
      * @param res The Translator resource.
      * @return The newly-created PreviewDialog.
+     * @throws OutputException For errors loading resources.
      */
-    protected PreviewDialog createPreviewDialog(
-            final AWTRenderer renderer,
-            final Translator res) {
+    protected PreviewDialog createPreviewDialog(final AWTRenderer renderer, final Translator res)
+            throws OutputException {
         final PreviewDialog frame = new PreviewDialog(renderer, res);
         frame.validate();
         frame.addWindowListener(new WindowAdapter() {
@@ -152,7 +154,12 @@
         new FOrayTarget(document, renderer, null, null);
 
         //Create preview dialog (target for the AWTRenderer)
-        final PreviewDialog frame = createPreviewDialog(renderer, translator);
+        PreviewDialog frame;
+        try {
+            frame = createPreviewDialog(renderer, translator);
+        } catch (final OutputException e) {
+            throw new FOrayException(e);
+        }
         renderer.setComponent(frame);
 
         // TODO: This is probably not right. Needs to run session.process().

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2010-02-01 23:52:06 UTC (rev 10920)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2010-02-02 00:04:40 UTC (rev 10921)
@@ -35,7 +35,7 @@
 
 package org.foray.render.awt.viewer;
 
-import org.apache.commons.logging.Log;
+import org.axsl.output.OutputException;
 
 import java.awt.event.ActionEvent;
 import java.net.URL;
@@ -61,9 +61,6 @@
     private static final String IMAGE_DIR =
             "/org/foray/render/awt/viewer/images/";
 
-    /** The parent dialog box. */
-    private PreviewDialog parent;
-
     /**
      * Constructor for no icon.
      * @param dialog The parent dialog.
@@ -82,7 +79,6 @@
     public Command(final PreviewDialog dialog, final String name,
             final ImageIcon anIcon) {
         super(name, anIcon);
-        this.parent = dialog;
     }
 
     /**
@@ -90,15 +86,14 @@
      * @param dialog The parent dialog.
      * @param name The command name.
      * @param iconName The name of the icon to use.
+     * @throws OutputException If the icon cannot be found.
      */
-    public Command(final PreviewDialog dialog, final String name,
-            final String iconName) {
+    public Command(final PreviewDialog dialog, final String name, final String iconName) throws OutputException {
         super(name);
-        this.parent = dialog;
         final String path = Command.IMAGE_DIR + iconName + ".gif";
         final URL url = getClass().getResource(path);
         if (url == null) {
-            getLogger().error("Icon not found: " + path);
+            throw new OutputException("Icon not found: " + path);
         } else {
             putValue(SMALL_ICON, new ImageIcon(url));
         }
@@ -115,22 +110,12 @@
      * Action handler which can be overriden by subclasses.
      */
     public void doit() {
-        getLogger().error("Not implemented.");
     }
 
     /**
      * Action handler which can be overriden by subclasses.
      */
     public void undoit() {
-        getLogger().error("Not implemented.");
     }
 
-    /**
-     * Returns the logger.
-     * @return The logger.
-     */
-    public Log getLogger() {
-        return this.parent.getLogger();
-    }
-
 }

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java	2010-02-01 23:52:06 UTC (rev 10920)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java	2010-02-02 00:04:40 UTC (rev 10921)
@@ -28,8 +28,6 @@
 
 package org.foray.render.awt.viewer;
 
-import org.apache.commons.logging.Log;
-
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
@@ -104,10 +102,9 @@
      * @param title The title of the dialog.
      * @param modal Indicates whether this dialog is modal.
      * @param resource The Translator resource.
-     * @param logger The logger.
      */
     public GoToPageDialog(final Frame frame, final String title,
-            final boolean modal, final Translator resource, final Log logger) {
+            final boolean modal, final Translator resource) {
         super(frame, title, modal);
         this.res = resource;
         jbInit();

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java	2010-02-01 23:52:06 UTC (rev 10920)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java	2010-02-02 00:04:40 UTC (rev 10921)
@@ -46,6 +46,7 @@
 import org.foray.render.awt.AWTRenderer;
 
 import org.axsl.galley.GalleyVisitorException;
+import org.axsl.output.OutputException;
 
 import org.apache.commons.logging.Log;
 
@@ -66,6 +67,7 @@
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -230,20 +232,16 @@
     /** Label for the preview image. */
     private JLabel previewImageLabel = new JLabel();
 
-    /** The logger. */
-    private Log logger;
-
      /**
      * Create a new PreviewDialog that uses the given starter, renderer and
      * translator.
      * @param aRenderer The AWTRenderer to use.
      * @param aRes The Translator translator.
      * @param logger The logger to use.
+     * @throws OutputException For errors loading resources.
      */
-    public PreviewDialog(final AWTRenderer aRenderer, final Translator aRes,
-            final Log logger) {
+    public PreviewDialog(final AWTRenderer aRenderer, final Translator aRes, final Log logger) throws OutputException {
         this(aRenderer, aRes);
-        this.logger = logger;
     }
 
     /**
@@ -251,8 +249,9 @@
      *
      * @param aRenderer the to use renderer
      * @param aRes the to use translator
+     * @throws OutputException For errors loading resources.
      */
-    public PreviewDialog(final AWTRenderer aRenderer, final Translator aRes) {
+    public PreviewDialog(final AWTRenderer aRenderer, final Translator aRes) throws OutputException {
         this.res = aRes;
         this.renderer = aRenderer;
 
@@ -647,9 +646,7 @@
      * Shows a page by number.
      */
     private void goToPage() {
-        final GoToPageDialog d = new GoToPageDialog(this,
-                this.res.getString("Go to Page"), true,
-                this.res, getLogger());
+        final GoToPageDialog d = new GoToPageDialog(this, this.res.getString("Go to Page"), true, this.res);
         d.setLocation((int) getLocation().getX()
                 + PreviewDialog.NEW_PAGE_OFFSET,
                 (int) getLocation().getY() + PreviewDialog.NEW_PAGE_OFFSET);
@@ -837,12 +834,4 @@
         );
     }
 
-    /**
-     * Returns the logger.
-     * @return The logger.
-     */
-    public Log getLogger() {
-        return this.logger;
-    }
-
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.