[FOray-commit] SF.net SVN: foray: [7669] trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java

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

Revision: 7669
Author:   victormote
Date:     2006-06-16 19:37:52 -0700 (Fri, 16 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7669&view=rev

Log Message:
-----------
Fix interface hierarchy.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java	2006-06-17 02:37:45 UTC (rev 7668)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java	2006-06-17 02:37:52 UTC (rev 7669)
@@ -28,7 +28,6 @@
 import org.axsl.areaW.AreaWException;
 import org.axsl.areaW.ListBlockArea;
 import org.axsl.areaW.ListItemArea;
-import org.axsl.areaW.NormalBlockArea;
 import org.axsl.foR.fo.ListItem;
 import org.axsl.foR.fo.ListItemBody;
 import org.axsl.foR.fo.ListItemLabel;
@@ -49,24 +48,21 @@
 
     public int layout(Area area, RetrieveMarker retrieveMarker)
             throws AreaWException {
-        if (! (area instanceof NormalBlockArea)) {
+        if (! (area instanceof ListBlockArea)) {
             throw new AreaWException("Illegal parent area for fo:list-item");
         }
-        NormalBlockArea blockArea = (NormalBlockArea) area;
+        ListBlockArea blockArea = (ListBlockArea) area;
         return layout(blockArea, retrieveMarker);
     }
 
-    public int layout(NormalBlockArea area, RetrieveMarker retrieveMarker)
+    public int layout(ListBlockArea area, RetrieveMarker retrieveMarker)
             throws AreaWException {
         ListItem node = getFO();
-        ListBlockArea listBlockArea = (ListBlockArea) area;
         if (getProgress() == FONodePL.START) {
             setProgress(0);
         }
 
-        layout.completeCurrentLineInBlock(area);
-
-        ListItemArea group = listBlockArea.makeListItemArea(node,
+        ListItemArea group = area.makeListItemArea(node,
                 retrieveMarker);
 
         /* Now lay out the list-item-label inside the new block-area. */
@@ -82,19 +78,16 @@
                 return status;
             }
         }
-        layout.completeCurrentLineInBlock(group);
 
         /* Now create a BlockArea to contain the list-item-body. */
         ListItemBody body = (ListItemBody)node.childrenFO().get(1);
         ListItemBodyPL bodyPL = (ListItemBodyPL) getLayoutProxy(body);
         status = bodyPL.layout(group, retrieveMarker);
         if (Status.isIncomplete(status)) {
-            layout.completeCurrentLineInBlock(group);
             setProgress(1);
             return status;
         }
 
-        layout.completeCurrentLineInBlock(group);
         return Status.OK;
     }
 


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