[FOray-commit] SF.net SVN: foray: [7305] trunk/foray/foray-areatree/src/java/org/foray/area

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

Revision: 7305
Author:   victormote
Date:     2006-05-29 11:42:45 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7305&view=rev

Log Message:
-----------
Conform to axsl area-tree changes. Keep track of footnote layout status in the layout system, not in the area tree.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-05-29 18:42:37 UTC (rev 7304)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java	2006-05-29 18:42:45 UTC (rev 7305)
@@ -28,8 +28,7 @@
 import org.axsl.foR.FObj;
 
 /**
- * Manages the main-reference-area. Its parent should always be an instance of
- * RegionRABody.
+ * Manages the footnote reference area for a page.
  */
 public class FootnoteRA extends AreaFixed implements org.axsl.areaW.FootnoteRA {
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:42:37 UTC (rev 7304)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java	2006-05-29 18:42:45 UTC (rev 7305)
@@ -45,7 +45,7 @@
     private int dimensionBeforeFloatRA;
 
     // keeps track of footnote state for multiple layouts
-    private int footnoteState = 0;
+//    private int footnoteState = 0;
 
     public RegionRABody(RegionBody generatedBy, PageRA parentArea,
             int xPosition, int yPosition) {
@@ -81,24 +81,6 @@
         return footnoteReferenceArea;
     }
 
-    public int getFootnoteState() {
-        return footnoteState;
-    }
-
-    public boolean needsFootnoteAdjusting() {
-        int footnoteYPosition = footnoteReferenceArea.crOriginY();
-        switch (footnoteState) {
-        case 0:
-            if (footnoteReferenceArea.crBPD() > 0
-                    && mainReferenceArea.crBPD() > footnoteYPosition) {
-                return true;
-            }
-        case 1:
-            break;
-        }
-        return false;
-    }
-
     protected static void resetMaxHeight(Area ar, int change) {
         List childs = ar.getChildren();
         for (int i = 0; i < childs.size(); i++) {


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