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

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

Revision: 9937
          http://svn.sourceforge.net/foray/?rev=9937&view=rev
Author:   victormote
Date:     2007-07-06 10:02:15 -0700 (Fri, 06 Jul 2007)

Log Message:
-----------
Conform to axsl changes renaming two interfaces.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -43,7 +43,7 @@
  * The AreaTree representation of an fo:bookmark object.
  */
 public final class BookmarkArea extends BookmarkParentArea
-        implements org.axsl.galley.BookmarkArea {
+        implements org.axsl.galley.Bookmark {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private FOLinkage generatedBy;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -39,7 +39,7 @@
  * A NonArea class for items generated by fo:bookmark-tree.
  */
 public final class BookmarkTreeArea extends BookmarkParentArea
-        implements org.axsl.galley.BookmarkTreeArea {
+        implements org.axsl.galley.BookmarkTree {
 
     /** The "generated-by" trait, as defined in Section 6.1.1. */
     private FOLinkage generatedBy;

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-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -45,7 +45,7 @@
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.FootnoteArea;
 import org.axsl.galley.ForeignObjectArea;
@@ -514,7 +514,7 @@
     /**
      * {@inheritDoc}
      */
-    public abstract void render(BookmarkTreeArea area);
+    public abstract void render(BookmarkTree area);
 
     /**
      * {@inheritDoc}

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -48,7 +48,7 @@
 import org.axsl.font.FontConsumer;
 import org.axsl.font.FontUse;
 import org.axsl.galley.Area;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
@@ -746,7 +746,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final BookmarkTreeArea area) {
+    public void render(final BookmarkTree area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -43,7 +43,7 @@
 
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.Font;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
@@ -709,7 +709,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final BookmarkTreeArea area) {
+    public void render(final BookmarkTree area) {
         return;
     }
 

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-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -44,8 +44,8 @@
 import org.axsl.galley.Area;
 import org.axsl.galley.AreaNode;
 import org.axsl.galley.Galley;
-import org.axsl.galley.BookmarkArea;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.Bookmark;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
@@ -513,9 +513,9 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final BookmarkTreeArea area) {
+    public void render(final BookmarkTree area) {
         for (int i = 0; i < area.getChildCount(); i++) {
-            final BookmarkArea child = (BookmarkArea) area.getChildAt(i);
+            final Bookmark child = (Bookmark) area.getChildAt(i);
             renderBookmark(child, pdfDoc.getOutlineRoot());
         }
     }
@@ -526,7 +526,7 @@
      * @param parent The PDF outline object to which the rendered bookmarks
      * should be added.
      */
-    public void renderBookmark(final BookmarkArea area,
+    public void renderBookmark(final Bookmark area,
             final PdfOutlineParent parent) {
         if (area == null || parent == null) {
             return;
@@ -547,8 +547,8 @@
         // Recursively handle child bookmarks
         for (int i = 0; i < area.getChildCount(); i++) {
             final AreaNode child = area.getChildAt(i);
-            if (child instanceof BookmarkArea) {
-                renderBookmark((BookmarkArea) child, pdfOutline);
+            if (child instanceof Bookmark) {
+                renderBookmark((Bookmark) child, pdfOutline);
             }
         }
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -47,7 +47,7 @@
 import org.axsl.font.FontUse;
 import org.axsl.font.output.FontPs;
 import org.axsl.galley.Area;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
 import org.axsl.galley.GraphicArea;
@@ -1064,7 +1064,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final BookmarkTreeArea area) {
+    public void render(final BookmarkTree area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -37,7 +37,7 @@
 import org.axsl.common.value.RuleStyle;
 import org.axsl.font.FontConsumer;
 import org.axsl.galley.Area;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
@@ -335,7 +335,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final BookmarkTreeArea area) {
+    public void render(final BookmarkTree area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -34,7 +34,7 @@
 import org.foray.render.Renderer;
 
 import org.axsl.common.value.RuleStyle;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.ForeignObjectArea;
 import org.axsl.galley.GeneralInlineArea;
@@ -539,7 +539,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final BookmarkTreeArea area) {
+    public void render(final BookmarkTree area) {
         return;
     }
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-07-06 16:56:41 UTC (rev 9936)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2007-07-06 17:02:15 UTC (rev 9937)
@@ -45,7 +45,7 @@
 import org.axsl.galley.BackgroundArea;
 import org.axsl.galley.BeforeFloatArea;
 import org.axsl.galley.BlockContainerArea;
-import org.axsl.galley.BookmarkTreeArea;
+import org.axsl.galley.BookmarkTree;
 import org.axsl.galley.ExternalGraphicArea;
 import org.axsl.galley.FootnoteArea;
 import org.axsl.galley.ForeignObjectArea;
@@ -390,7 +390,7 @@
     /**
      * {@inheritDoc}
      */
-    public void render(final BookmarkTreeArea area) {
+    public void render(final BookmarkTree area) {
         return;
     }
 


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