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

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

Revision: 10055
          http://svn.sourceforge.net/foray/?rev=10055&view=rev
Author:   victormote
Date:     2007-07-19 16:06:07 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
Conform to axsl changes moving methods from Fo to new property-specific interfaces.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
    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/InlineContainerArea.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-areatree/src/java/org/foray/area/TextArea.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2007-07-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -238,4 +238,29 @@
         return 0;
     }
 
+    /**
+     * Returns the BPD for an inline area.
+     * @return The BPD for an inline area.
+     */
+    protected int crBPDInline() {
+        int actual = 0;
+        final int computed = this.getBpDimensionOpt();
+        if (computed < 0) {
+            actual = ancestorArea().crBpd()
+                    - traitBorderBeforeWidth()
+                    - traitBorderAfterWidth()
+                    - traitPaddingBefore()
+                    - traitPaddingAfter();
+        } else {
+            actual = computed;
+        }
+        return actual;
+    }
+
+    /**
+     * Returns the optimum block-progression-dimension for this inline area.
+     * @return The optimum bpd for this area, in millipoints.
+     */
+    protected abstract int getBpDimensionOpt();
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -647,30 +647,6 @@
     public abstract int traitSpaceEndOptimum();
 
     /**
-     * Return the minimum BP dimension for this area.
-     * @return The minimum BP dimension for this area, or -1 for "auto".
-     */
-    public int traitBPDimensionMin() {
-        return traitGeneratedBy().traitBpDimensionMin(this);
-    }
-
-    /**
-     * Return the optimum BP dimension for this area.
-     * @return The optimum BP dimension for this area, or -1 for "auto".
-     */
-    public int traitBPDimensionOpt() {
-        return traitGeneratedBy().traitBpDimensionOpt(this);
-    }
-
-    /**
-     * Return the maximum BP dimension for this area.
-     * @return The maximim BP dimension for this area, or -1 for "auto".
-     */
-    public int traitBPDimensionMax() {
-        return traitGeneratedBy().traitBpDimensionMax(this);
-    }
-
-    /**
      * Return the minimum IP dimension for this area.
      * @return The minimum IP dimension for this area, or -1 for "auto".
      */

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2007-07-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -198,25 +198,6 @@
     }
 
     /**
-     * Returns the BPD for an inline area.
-     * @return The BPD for an inline area.
-     */
-    protected int crBPDInline() {
-        int actual = 0;
-        final int computed = this.traitBPDimensionOpt();
-        if (computed < 0) {
-            actual = ancestorArea().crBpd()
-                    - traitBorderBeforeWidth()
-                    - traitBorderAfterWidth()
-                    - traitPaddingBefore()
-                    - traitPaddingAfter();
-        } else {
-            actual = computed;
-        }
-        return actual;
-    }
-
-    /**
      * Computes the initial value of anteriorSpace for this Area.
      */
     public void initializeAnteriorSpace() {

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-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -345,4 +345,11 @@
         return null;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return this.traitGeneratedBy().traitBpDimensionOpt(this);
+    }
+
 }

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-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -357,4 +357,11 @@
         return null;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return this.traitGeneratedBy().traitBpDimensionOpt(this);
+    }
+
 }

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-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -487,4 +487,11 @@
         return traitGeneratedBy().traitThroughScoreColor(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return this.traitGeneratedBy().traitBpDimensionOpt(this);
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java	2007-07-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -334,4 +334,11 @@
         return newListBlockArea;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return this.traitGeneratedBy().traitBpDimensionOpt(this);
+    }
+
 }

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-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -718,4 +718,11 @@
         return null;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return 0;
+    }
+
 }

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-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -339,4 +339,11 @@
         return traitGeneratedBy().traitThroughScoreColor(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return 0;
+    }
+
 }

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-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -368,4 +368,11 @@
         return traitGeneratedBy().traitThroughScoreColor(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2007-07-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -973,4 +973,11 @@
         return traitGeneratedBy().traitThroughScoreColor(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    protected int getBpDimensionOpt() {
+        return 0;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-19 22:37:11 UTC (rev 10054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-19 23:06:07 UTC (rev 10055)
@@ -113,6 +113,7 @@
 import org.axsl.fo.fo.prop.BaselineShiftPa;
 import org.axsl.fo.fo.prop.BasicLinkPa;
 import org.axsl.fo.fo.prop.BlockPa;
+import org.axsl.fo.fo.prop.BlockProgressionDimensionPa;
 import org.axsl.fo.fo.prop.CaptionSidePa;
 import org.axsl.fo.fo.prop.CaseNamePa;
 import org.axsl.fo.fo.prop.CaseTitlePa;
@@ -202,8 +203,8 @@
         CommonHyphenationPa, CommonMarginBlockPa, CommonMarginInlinePa,
         CommonRelativePositionPa, ActiveStatePa, AlignmentAdjustPa,
         AlignmentBaselinePa, AutoRestorePa, BaselineShiftPa, BasicLinkPa,
-        BlockPa, CaptionSidePa, CaseNamePa, CaseTitlePa, CharacterPa, ClearPa,
-        ClipPa,
+        BlockPa, BlockProgressionDimensionPa, CaptionSidePa, CaseNamePa,
+        CaseTitlePa, CharacterPa, ClearPa, ClipPa,
         ColorProfileNamePa, ColumnCountPa, ColumnGapPa, ContentTypePa,
         DirectionPa, DisplayAlignPa, DominantBaselinePa, EmptyCellsPa, ExtentPa,
         ExternalDestinationPa, FloatPa, FlowNamePa, GlyphOrientationPa,


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