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

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

Revision: 10507
          http://foray.svn.sourceforge.net/foray/?rev=10507&view=rev
Author:   victormote
Date:     2008-03-24 15:41:42 -0700 (Mon, 24 Mar 2008)

Log Message:
-----------
General cleanup of Exceptions and dumping of stack traces.

Modified Paths:
--------------
    trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java
    trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java
    trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java	2008-03-24 22:28:52 UTC (rev 10506)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java	2008-03-24 22:41:42 UTC (rev 10507)
@@ -329,7 +329,6 @@
                         .getMessage());
             }
         } else if (exception instanceof FOrayException) {
-            exception.printStackTrace();
             if (((FOrayException) exception).getException() != null) {
                 log.error(((FOrayException) exception).getException()
                         .getMessage());

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java	2008-03-24 22:28:52 UTC (rev 10506)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java	2008-03-24 22:41:42 UTC (rev 10507)
@@ -186,11 +186,11 @@
         return super.getMessage();
     }
 
+    /* Checkstyle-GenericIllegalRegexp-Off. */
     /**
      * {@inheritDoc}
      */
     public void printStackTrace() {
-        /* Checkstyle-GenericIllegalRegexp-Off. */
         synchronized (System.err) {
             super.printStackTrace();
             if (this.exception != null) {
@@ -202,7 +202,6 @@
                 getRootException().printStackTrace();
             }
         }
-        /* Checkstyle-GenericIllegalRegexp-On. */
     }
 
     /**
@@ -238,5 +237,6 @@
             }
         }
     }
+    /* Checkstyle-GenericIllegalRegexp-On. */
 
 }

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2008-03-24 22:28:52 UTC (rev 10506)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2008-03-24 22:41:42 UTC (rev 10507)
@@ -35,6 +35,7 @@
 import org.axsl.area.AreaTreeFactory;
 import org.axsl.area.AreaTreeListener;
 import org.axsl.fo.FoTreeEvent;
+import org.axsl.fo.FoTreeException;
 import org.axsl.fo.FoTreeListener;
 import org.axsl.fo.fo.PageSequence;
 import org.axsl.font.FontConsumer;
@@ -321,42 +322,34 @@
     }
 
     /**
-     * Required by the FOTreeListener interface. It handles an
-     * FOTreeEvent that is fired when an FObj object has been completed. We
-     * do not need to do anything with it, so we ignore it.
-     * @param event The FOTreeEvent that was fired.
+     * {@inheritDoc}
      */
     public void foComplete(final FoTreeEvent event) {
     }
 
     /**
-     * Required by the FOTreeListener interface. It handles an
-     * FOTreeEvent that is fired when a PageSequence object has been completed.
-     * @param event the FOTreeEvent that was fired
+     * {@inheritDoc}
      */
-    public void foPageSequenceComplete(final FoTreeEvent event) {
+    public void foPageSequenceComplete(final FoTreeEvent event) throws FoTreeException {
         try {
             final boolean shouldRender = this.getSessionConfig().isModeRender();
             if (shouldRender) {
                 render(event.getPageSequence());
             }
         } catch (final FOrayException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            throw new FoTreeException(e);
         }
     }
 
     /**
-     * Required by the FOTreeListener interface. It handles an FOTreeEvent that
-     * is fired when the Document has been completely parsed.
-     * @param event the FOTreeEvent that was fired
+     * {@inheritDoc}
      */
-    public void foDocumentComplete(final FoTreeEvent event) {
+    public void foDocumentComplete(final FoTreeEvent event) throws FoTreeException {
         getCreatedAreaTree().contentComplete();
         try {
             stopRenderer();
         } catch (final SAXException e) {
-            e.printStackTrace();
+            throw new FoTreeException(e);
         }
     }
 

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java	2008-03-24 22:28:52 UTC (rev 10506)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java	2008-03-24 22:41:42 UTC (rev 10507)
@@ -166,11 +166,15 @@
         } catch (final FoTreeException e) {
             throw new SAXException(e);
         }
-        notifyFObjComplete(this.currentFObj);
+        try {
+            notifyFObjComplete(this.currentFObj);
 
-        if (this.currentFObj instanceof PageSequence) {
-            // Notify the listeners that this page-sequence is complete.
-            notifyPageSequenceComplete((PageSequence) this.currentFObj);
+            if (this.currentFObj instanceof PageSequence) {
+                // Notify the listeners that this page-sequence is complete.
+                notifyPageSequenceComplete((PageSequence) this.currentFObj);
+            }
+        } catch (final FoTreeException e) {
+            throw new SAXException(e);
         }
         this.currentFObj = this.currentFObj.getParsedParent();
     }
@@ -191,7 +195,11 @@
     @Override
     public void endDocument() throws SAXException {
         getLogger().info("End parsing the Formatting Object (FO) input.");
-        notifyDocumentComplete();
+        try {
+            notifyDocumentComplete();
+        } catch (final FoTreeException e) {
+            throw new SAXException(e);
+        }
     }
 
     /**
@@ -374,7 +382,7 @@
      * FOTreeEvent has been fired.
      * @param fobj The FObj instance that was just completed.
      */
-    private void notifyFObjComplete(final FObj fobj) {
+    private void notifyFObjComplete(final FObj fobj) throws FoTreeException {
         /* If nobody wants these events, don't waste resources creating
          * them. */
         if (this.qtyFObjListeners < 1) {
@@ -392,7 +400,8 @@
      * FOTreeEvent has been fired.
      * @param pageSequence The PageSequence instance that was just completed.
      */
-    private void notifyPageSequenceComplete(final PageSequence pageSequence) {
+    private void notifyPageSequenceComplete(final PageSequence pageSequence)
+            throws FoTreeException {
         final FoTreeEvent event = new FoTreeEvent(this, pageSequence);
         for (int i = 0; i < this.foTreeListeners.size(); i++) {
             final FoTreeListener listener = this.foTreeListeners.get(i);
@@ -404,7 +413,7 @@
      * Notify all objects in the foTreeListeners that a "Document Complete"
      * FOTreeEvent has been fired.
      */
-    private void notifyDocumentComplete() {
+    private void notifyDocumentComplete() throws FoTreeException {
         final FoTreeEvent event = new FoTreeEvent(this);
         for (int i = 0; i < this.foTreeListeners.size(); i++) {
             final FoTreeListener listener = this.foTreeListeners.get(i);


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