Thread: [FOray-commit] SF.net SVN: foray: [7420] trunk/foray/foray-areatree/src/java/org/foray/area (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7420
Author:   victormote
Date:     2006-06-05 15:58:00 -0700 (Mon, 05 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7420&view=rev

Log Message:
-----------
Remove absolutely-positioned items from the computation of parent size.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================

--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-05 20:20:23 UTC (rev 7419)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-06-05 22:58:00 UTC (rev 7420)
@@ -959,6 +959,8 @@
      */
     public abstract int progressionDimensionAvailable();
 
+    public abstract int getProgressionDimension();
+
     public abstract void setProgressionDimension(int progressionDimension);
 
     public abstract void setMinimumProgressionDimension(int minimumPD);
@@ -1221,4 +1223,23 @@
         return true;
     }
 
+    public boolean shouldAdjustParentPD() {
+        /* If not in the normal flow, the parent's dimensions are not used up
+         * as this grows. */
+        if (! this.isInNormalFlow()) {
+            return false;
+        }
+        Area parent = getParentArea();
+        if (parent instanceof LineArea) {
+            /* LineArea children grow in the IPD, LineArea grows in the BPD. */
+            return false;
+        }
+        if (parent instanceof TableRowContainer) {
+            /* TableRowContainer children grow in the IPD, LineArea grows in the
+             * BPD. */
+            return false;
+        }
+        return true;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java	2006-06-05 20:20:23 UTC (rev 7419)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java	2006-06-05 22:58:00 UTC (rev 7420)
@@ -55,6 +55,14 @@
         return dimension;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public int getProgressionDimension() {
+        /* No-op. Exists here to minimize casts. */
+        return 0;
+    }
+
     public void setProgressionDimension(int progressionDimension) {
         // No-op. Exists here to minimize casts.
         return;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-06-05 20:20:23 UTC (rev 7419)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2006-06-05 22:58:00 UTC (rev 7420)
@@ -142,54 +142,27 @@
      * @param progressionDimension The progressionDimension to set.
      */
     public void setProgressionDimension(int progressionDimension) {
-        Area parent = getParentArea();
-        if (parent instanceof AreaFlexible && ! (parent instanceof LineArea)
-                && ! (parent instanceof TableRowContainer)) {
-            /*
-             * LineArea and TableRowContainer use progressionDimension
-             * differently than other classes, because they are "pivots" that
-             * switch between inline-progress-direction and
-             * block-progression-direction.
-             */
-            AreaFlexible afParent = (AreaFlexible) parent;
-            adjustParentPD(progressionDimension, afParent);
+        if (shouldAdjustParentPD()) {
+            Area parent = getParentArea();
+            /* The new value. */
+            int incrementAmount = progressionDimension;
+            /* Subtract the old value. */
+            incrementAmount -= this.getProgressionDimension();
+            parent.incrementProgressionDimension(incrementAmount);
         }
         this.progressionDimension = progressionDimension;
     }
 
     /**
-     * @param progressionDimension
-     * @param afParent
-     */
-    protected void adjustParentPD(int progressionDimension,
-            AreaFlexible afParent) {
-        int value = afParent.getProgressionDimension();
-        // Subtract the old value
-        value -= this.getProgressionDimension();
-        // Add the new value
-        value += progressionDimension;
-        // Set the recomputed value;
-        afParent.setProgressionDimension(value);
-    }
-
-    /**
      * Change the progressionDimension for this Area by incrementAmount.
      * See {@link #getProgressionDimension()} for a description of
      * "progression dimension".
      * @param incrementAmount The amount to adjust the progressionDimension.
      */
     public void incrementProgressionDimension(int incrementAmount) {
-        Area parent = getParentArea();
-        if (parent instanceof AreaFlexible
-                && ! (parent instanceof LineArea)
-                && this.isInNormalFlow()) {
-            /*
-             * LineArea uses progressionDimension differently than any other
-             * class, because it is the "pivot" that switches between
-             * inline-progress-direction and block-progression-dimension.
-             */
-            AreaFlexible afParent = (AreaFlexible) parent;
-            afParent.incrementProgressionDimension(incrementAmount);
+        if (shouldAdjustParentPD()) {
+            Area parent = getParentArea();
+            parent.incrementProgressionDimension(incrementAmount);
         }
         this.progressionDimension += incrementAmount;
     }


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





Thread: [FOray-commit] SF.net SVN: foray: [7420] trunk/foray/foray-areatree/src/java/org/foray/area (Page 3)

Modular XSL-FO Implementation for Java.

foray-commit