foray-commit Mailing List for FOray

Revision: 10892
          http://foray.svn.sourceforge.net/foray/?rev=10892&view=rev
Author:   victormote
Date:     2009-08-27 19:53:43 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Minor improvements to the error message.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java	2009-08-27 19:48:27 UTC (rev 10891)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java	2009-08-27 19:53:43 UTC (rev 10892)
@@ -92,13 +92,12 @@
     private String unexpectedValueMessage(final String reason,
             final String value, final FObj fobj) {
         final StringBuilder buffer = new StringBuilder();
-        buffer.append("Unexpected value for ");
+        buffer.append("Unexpected value for property \"");
         buffer.append(getPropertyType().toStringUnparsed());
-        buffer.append(": \"" + value + "\"\n");
+        buffer.append("\": \"" + value + "\"");
         if (reason != null) {
-            buffer.append("  Reason: " + reason + "\n");
+            buffer.append("  Reason: " + reason);
         }
-        buffer.append(fobj.getContextMessage());
         return buffer.toString();
     }
 


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

Revision: 10891
          http://foray.svn.sourceforge.net/foray/?rev=10891&view=rev
Author:   victormote
Date:     2009-08-27 19:48:27 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Improve the error message by adding a reason.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PdSrc.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PdSrc.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PdSrc.java	2009-08-27 19:22:19 UTC (rev 10890)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PdSrc.java	2009-08-27 19:48:27 UTC (rev 10891)
@@ -82,7 +82,7 @@
         if (pv != null) {
             return pv;
         }
-        throw unexpectedValue(value, fobj);
+        throw unexpectedValue(value, fobj, "Not a valid XSL-FO <uri-specification>");
     }
 
     /**


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

Revision: 10890
          http://foray.svn.sourceforge.net/foray/?rev=10890&view=rev
Author:   victormote
Date:     2009-08-27 19:22:19 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Add a test document for side floats.

Added Paths:
-----------
    trunk/foray/resource/fo-examples/basic/float-side.fo

Added: trunk/foray/resource/fo-examples/basic/float-side.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/float-side.fo	                        (rev 0)
+++ trunk/foray/resource/fo-examples/basic/float-side.fo	2009-08-27 19:22:19 UTC (rev 10890)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<fo:root
+    font-family="Times Roman"
+    font-size="12pt"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+<fo:layout-master-set>
+<fo:simple-page-master
+    master-name="right"
+    margin-top="75pt"
+    margin-bottom="25pt"
+    margin-left="100pt"
+    margin-right="50pt">
+  <fo:region-body margin-bottom="50pt"/>
+  <fo:region-after extent="25pt"/>
+</fo:simple-page-master>
+
+<fo:simple-page-master
+    master-name="left"
+    margin-top="75pt"
+    margin-bottom="25pt"
+    margin-left="50pt"
+    margin-right="100pt">
+  <fo:region-body margin-bottom="50pt"/>
+  <fo:region-after extent="25pt"/>
+</fo:simple-page-master>
+
+<fo:page-sequence-master master-name="psmOddEven">
+  <fo:repeatable-page-master-alternatives>
+    <fo:conditional-page-master-reference
+        master-reference="right"
+        page-position="first" />
+    <fo:conditional-page-master-reference
+        master-reference="left"
+        odd-or-even="even" />
+    <fo:conditional-page-master-reference
+        master-reference="right"
+        odd-or-even="odd" />
+  </fo:repeatable-page-master-alternatives>
+</fo:page-sequence-master>
+
+</fo:layout-master-set>
+
+<fo:page-sequence master-reference="psmOddEven">
+<fo:flow flow-name="xsl-region-body">
+  <fo:block
+        font-size="16pt"
+        font-weight="bold"
+        text-align="center"
+        space-before.minimum="1em"
+        space-before.optimum="1.5em"
+        space-before.maximum="2em">A float toward the "start".</fo:block>
+  <fo:block>
+      <fo:float float="start">
+          <fo:external-graphic src="url('../graphics/xml_feather.gif')"/>
+      </fo:float>
+      It was the best of times. It was the worst of times. Some said that it was the best of the worst of times, and
+      some said that it was the worst of the best of times, but, really, neither of these can be proved. For it to be
+      both the best and worst of times, one of two things must be true: 1) either "best" and "worst" must describe
+      different axes of "times", or 2) if they describe the same axis, then "best" must be equal to "worst". The latter
+      of these would seem to be silly, as the author could have saved quite a bit of ink by saying "it was the times".
+      So perhaps somewhere in the remainder of the book, the author will describe the two axes. I don't know, because I
+      didn't get past the first two sentences. They sent me into a philosphical quandary from which I have not
+      recovered.
+  </fo:block>
+
+  <fo:block
+        font-size="16pt"
+        font-weight="bold"
+        text-align="center"
+        space-before.minimum="1em"
+        space-before.optimum="1.5em"
+        space-before.maximum="2em">A float toward the "end".</fo:block>
+  <fo:block>
+      <fo:float float="end">
+          <fo:external-graphic src="url('../graphics/xml_feather.gif')"/>
+      </fo:float>
+      It was the best of times. It was the worst of times. Some said that it was the best of the worst of times, and
+      some said that it was the worst of the best of times, but, really, neither of these can be proved. For it to be
+      both the best and worst of times, one of two things must be true: 1) either "best" and "worst" must describe
+      different axes of "times", or 2) if they describe the same axis, then "best" must be equal to "worst". The latter
+      of these would seem to be silly, as the author could have saved quite a bit of ink by saying "it was the times".
+      So perhaps somewhere in the remainder of the book, the author will describe the two axes. I don't know, because I
+      didn't get past the first two sentences. They sent me into a philosphical quandary from which I have not
+      recovered.
+  </fo:block>
+
+</fo:flow>
+</fo:page-sequence>
+
+</fo:root>


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

Revision: 10889
          http://foray.svn.sourceforge.net/foray/?rev=10889&view=rev
Author:   victormote
Date:     2009-08-27 18:49:32 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Make the error message more informative.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java

Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2009-08-27 18:44:06 UTC (rev 10888)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2009-08-27 18:49:32 UTC (rev 10889)
@@ -484,7 +484,8 @@
             try {
                 return new InputSource(this.foInput.openStream());
             } catch (final IOException e) {
-                throw new FOrayException(e);
+                throw new FOrayException("Error creating InputSource: " + e.getClass().getName() + ": "
+                        + e.getMessage() + " (" + this.foInput + ")", e);
             }
         }
         return null;


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

Revision: 10888
          http://foray.svn.sourceforge.net/foray/?rev=10888&view=rev
Author:   victormote
Date:     2009-08-27 18:44:06 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Let the superclass store the wrapped Throwable.

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

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java	2009-06-18 22:46:06 UTC (rev 10887)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java	2009-08-27 18:44:06 UTC (rev 10888)
@@ -325,13 +325,11 @@
         if (exception instanceof SAXException) {
             log.error(exception.getMessage());
             if (((SAXException) exception).getException() != null) {
-                log.error(((SAXException) exception).getException()
-                        .getMessage());
+                log.error(((SAXException) exception).getException().getMessage());
             }
         } else if (exception instanceof FOrayException) {
-            if (((FOrayException) exception).getException() != null) {
-                log.error(((FOrayException) exception).getException()
-                        .getMessage());
+            if (((FOrayException) exception).getCause() != null) {
+                log.error(((FOrayException) exception).getCause().getMessage());
             }
         } else {
             log.error(exception.getMessage());

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java	2009-06-18 22:46:06 UTC (rev 10887)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java	2009-08-27 18:44:06 UTC (rev 10888)
@@ -28,12 +28,7 @@
 
 package org.foray.core;
 
-import org.xml.sax.SAXException;
 
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-
 /**
  * Exception thrown when FOray has a problem.
  */
@@ -42,12 +37,6 @@
     /** Constant needed for serialization. */
     static final long serialVersionUID = 298590433713255908L;
 
-    /** Constant used when formatting exception messages. */
-    private static final String EXCEPTION_SEPARATOR = "\n---------\n";
-
-    /** The "caused by" exception, if any. */
-    private Throwable exception;
-
     /** The context message, if any. The context message is a message that tells
      * where in a source document the exception was created. */
     private String contextMessage;
@@ -77,8 +66,7 @@
      * @param thrown The thrown item to be wrapped.
      */
     public FOrayException(final Throwable thrown) {
-        super(thrown.getMessage());
-        setException(thrown);
+        super(thrown);
         this.contextMessage = null;
     }
 
@@ -90,8 +78,7 @@
      * exception.
      */
     public FOrayException(final Throwable thrown, final String contextMessage) {
-        super(thrown.getMessage());
-        setException(thrown);
+        super(thrown);
         this.contextMessage = contextMessage;
     }
 
@@ -102,8 +89,7 @@
      * @param message A message describing the nature of the exception.
      */
     public FOrayException(final String message, final Throwable thrown) {
-        super(message);
-        setException(thrown);
+        super(message, thrown);
         this.contextMessage = null;
     }
 
@@ -117,28 +103,11 @@
      */
     public FOrayException(final String message, final Throwable thrown,
             final String contextMessage) {
-        super(message);
-        setException(thrown);
+        super(message, thrown);
         this.contextMessage = contextMessage;
     }
 
     /**
-     * Sets the wrapped thrown item.
-     * @param thrown The thrown item to be wrapped inside the exception.
-     */
-    protected void setException(final Throwable thrown) {
-        this.exception = thrown;
-    }
-
-    /**
-     * Returns the thrown item, if any, wrapped inside this exception.
-     * @return The thrown item, if any, wrapped inside this exception.
-     */
-    public Throwable getException() {
-        return this.exception;
-    }
-
-    /**
      * Sets the context message for this exception.
      * @param contextMessage The new context message for this exception.
      */
@@ -155,27 +124,6 @@
     }
 
     /**
-     * Returns the original exception thrown.
-     * @return The original exception thrown.
-     */
-    protected Throwable getRootException() {
-        Throwable result = this.exception;
-
-        if (result instanceof SAXException) {
-            result = ((SAXException) result).getException();
-        }
-        if (result instanceof InvocationTargetException) {
-            result =
-                ((InvocationTargetException) result)
-                        .getTargetException();
-        }
-        if (result != this.exception) {
-            return result;
-        }
-        return null;
-    }
-
-    /**
      * {@inheritDoc}
      */
     public String getMessage() {
@@ -186,57 +134,4 @@
         return super.getMessage();
     }
 
-    /* Checkstyle-GenericIllegalRegexp-Off. */
-    /**
-     * {@inheritDoc}
-     */
-    public void printStackTrace() {
-        synchronized (System.err) {
-            super.printStackTrace();
-            if (this.exception != null) {
-                System.err.println(FOrayException.EXCEPTION_SEPARATOR);
-                this.exception.printStackTrace();
-            }
-            if (getRootException() != null) {
-                System.err.println(FOrayException.EXCEPTION_SEPARATOR);
-                getRootException().printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printStackTrace(final PrintStream stream) {
-        synchronized (stream) {
-            super.printStackTrace(stream);
-            if (this.exception != null) {
-                stream.println(FOrayException.EXCEPTION_SEPARATOR);
-                this.exception.printStackTrace(stream);
-            }
-            if (getRootException() != null) {
-                stream.println(FOrayException.EXCEPTION_SEPARATOR);
-                getRootException().printStackTrace(stream);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void printStackTrace(final PrintWriter writer) {
-        synchronized (writer) {
-            super.printStackTrace(writer);
-            if (this.exception != null) {
-                writer.println(FOrayException.EXCEPTION_SEPARATOR);
-                this.exception.printStackTrace(writer);
-            }
-            if (getRootException() != null) {
-                writer.println(FOrayException.EXCEPTION_SEPARATOR);
-                getRootException().printStackTrace(writer);
-            }
-        }
-    }
-    /* Checkstyle-GenericIllegalRegexp-On. */
-
 }


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