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

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

Revision: 10120
          http://foray.svn.sourceforge.net/foray/?rev=10120&view=rev
Author:   victormote
Date:     2007-07-27 12:35:18 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
Conform to axsl changes replacing some AreaTree interfaces with more generic interfaces.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2007-07-27 16:22:56 UTC (rev 10119)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2007-07-27 19:35:18 UTC (rev 10120)
@@ -43,7 +43,7 @@
  */
 public final class ExternalGraphicArea extends AbstractInlineArea
         implements org.axsl.galley.ExternalGraphicArea,
-        org.axsl.area.ExternalGraphicArea {
+        org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea}
      * or another {@link AbstractInlineArea}. */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-27 16:22:56 UTC (rev 10119)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-27 19:35:18 UTC (rev 10120)
@@ -45,7 +45,7 @@
  */
 public final class ForeignObjectArea extends AbstractInlineArea
         implements org.axsl.galley.ForeignObjectArea,
-        org.axsl.area.ForeignObjectArea {
+        org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea}
      * or another {@link AbstractInlineArea}. */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2007-07-27 16:22:56 UTC (rev 10119)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2007-07-27 19:35:18 UTC (rev 10120)
@@ -52,7 +52,7 @@
  */
 public final class InlineArea extends AbstractInlineArea
         implements org.axsl.galley.InlineArea,
-        org.axsl.area.InlineArea {
+        org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea}
      * or another {@link AbstractInlineArea}. */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-07-27 16:22:56 UTC (rev 10119)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-07-27 19:35:18 UTC (rev 10120)
@@ -77,7 +77,7 @@
  */
 public final class LeaderArea extends AbstractInlineArea
         implements org.axsl.galley.LeaderArea,
-        org.axsl.area.LeaderArea {
+        org.axsl.area.AncestralNormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea}
      * or another {@link AbstractInlineArea}. */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java	2007-07-27 16:22:56 UTC (rev 10119)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java	2007-07-27 19:35:18 UTC (rev 10120)
@@ -45,7 +45,7 @@
  */
 public final class PageNumberArea extends AbstractInlineArea
         implements org.axsl.galley.TextArea,
-        org.axsl.area.PageNumberArea {
+        org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea}
      * or another {@link AbstractInlineArea}. */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2007-07-27 16:22:56 UTC (rev 10119)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2007-07-27 19:35:18 UTC (rev 10120)
@@ -45,7 +45,7 @@
  */
 public final class PageNumberCitationArea extends AbstractInlineArea
         implements org.axsl.galley.TextArea,
-        org.axsl.area.PageNumberCitationArea {
+        org.axsl.area.NormalInlineArea {
 
     /** The parent of this node. The parent can be either a {@link LineArea}
      * or another {@link AbstractInlineArea}. */

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java	2007-07-27 16:22:56 UTC (rev 10119)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java	2007-07-27 19:35:18 UTC (rev 10120)
@@ -28,10 +28,10 @@
 
 package org.foray.pioneer;
 
+import org.axsl.area.AncestralNormalInlineArea;
 import org.axsl.area.AreaNode;
 import org.axsl.area.AreaTreeException;
 import org.axsl.area.BlockContentFactory;
-import org.axsl.area.InlineArea;
 import org.axsl.area.LineArea;
 import org.axsl.area.LineContentFactory;
 import org.axsl.area.NormalBlockArea;
@@ -97,7 +97,7 @@
                         /* Not enough room on the page for this. */
                         return Status.AREA_FULL_NONE;
                     }
-                    final InlineArea inlineArea =
+                    final AncestralNormalInlineArea inlineArea =
                             lineContentFactory.makeInlineArea(this.realFONode,
                                     graftingPoint);
                     this.getLayout().pushInlineStack(inlineArea);


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