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

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

Revision: 9932
          http://svn.sourceforge.net/foray/?rev=9932&view=rev
Author:   victormote
Date:     2007-07-05 16:02:40 -0700 (Thu, 05 Jul 2007)

Log Message:
-----------
Conform to axsl change renaming interface.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2007-07-05 22:53:09 UTC (rev 9931)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2007-07-05 23:02:40 UTC (rev 9932)
@@ -50,7 +50,7 @@
 /**
  * The root of the AreaTree.
  */
-public final class AreaTree extends NonArea implements org.axsl.galley.AreaTree,
+public final class AreaTree extends NonArea implements org.axsl.galley.Galley,
         org.axsl.area.AreaTree {
 
     /** The initial size at which the linkage map should be created. */

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2007-07-05 22:53:09 UTC (rev 9931)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2007-07-05 23:02:40 UTC (rev 9932)
@@ -250,7 +250,7 @@
             getLogger().info("Starting layout of page-sequence "
                     + pageSequenceCount + ".");
             final Renderer renderer = (Renderer) this.outputTarget;
-            final org.axsl.galley.AreaTree areaTreeR = getRenderedAreaTree();
+            final org.axsl.galley.Galley areaTreeR = getRenderedAreaTree();
             renderer.setAreaTree(areaTreeR);
             final org.axsl.area.PageCollection pageCollection;
             try {
@@ -285,13 +285,13 @@
      * @return The readable area tree.
      * @throws FOrayException If the area tree for this target is not readable.
      */
-    private org.axsl.galley.AreaTree getRenderedAreaTree()
+    private org.axsl.galley.Galley getRenderedAreaTree()
             throws FOrayException {
         final org.axsl.area.AreaTree areaTreeW = getCreatedAreaTree();
-        if (! (areaTreeW instanceof org.axsl.galley.AreaTree)) {
+        if (! (areaTreeW instanceof org.axsl.galley.Galley)) {
             throw new FOrayException("Area Tree cannot be rendered.");
         }
-        return (org.axsl.galley.AreaTree) areaTreeW;
+        return (org.axsl.galley.Galley) areaTreeW;
     }
 
     /**

Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2007-07-05 22:53:09 UTC (rev 9931)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2007-07-05 23:02:40 UTC (rev 9932)
@@ -41,7 +41,7 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.galley.Area;
 import org.axsl.galley.AreaNode;
-import org.axsl.galley.AreaTree;
+import org.axsl.galley.Galley;
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
@@ -97,7 +97,7 @@
     protected static final float SHADING_WEIGHT_BLUE = 0.11f;
 
     /** The AreaTree being rendered. */
-    private AreaTree areaTree;
+    private Galley areaTree;
 
     /**
      * Constructor.
@@ -112,7 +112,7 @@
      * Sets the AreaTree to be rendered.
      * @param areaTree The AreaTree to be rendered.
      */
-    public void setAreaTree(final AreaTree areaTree) {
+    public void setAreaTree(final Galley areaTree) {
         this.areaTree = areaTree;
     }
 
@@ -648,7 +648,7 @@
      * Returns the area tree being rendered.
      * @return The area tree being rendered.
      */
-    protected AreaTree getAreaTree() {
+    protected Galley getAreaTree() {
         return this.areaTree;
     }
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-07-05 22:53:09 UTC (rev 9931)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-07-05 23:02:40 UTC (rev 9932)
@@ -43,7 +43,7 @@
 import org.axsl.font.FontUse;
 import org.axsl.galley.Area;
 import org.axsl.galley.AreaNode;
-import org.axsl.galley.AreaTree;
+import org.axsl.galley.Galley;
 import org.axsl.galley.BookmarkArea;
 import org.axsl.galley.BookmarkTitleArea;
 import org.axsl.galley.BookmarkTreeArea;
@@ -582,7 +582,7 @@
      * Add the document metadata to the PDF.
      */
     private void renderDocumentMetadata() {
-        final AreaTree areaTree = this.getAreaTree();
+        final Galley areaTree = this.getAreaTree();
         this.pdfDoc.setTitle(areaTree.getTitle());
         this.pdfDoc.setAuthor(areaTree.getAuthor());
         this.pdfDoc.setSubject(areaTree.getSubject());


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