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

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

Revision: 10004
          http://svn.sourceforge.net/foray/?rev=10004&view=rev
Author:   victormote
Date:     2007-07-16 13:41:06 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
Conform to axsl changes removing some block margin-related methods from Fo.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

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-16 20:32:32 UTC (rev 10003)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-16 20:41:06 UTC (rev 10004)
@@ -807,24 +807,6 @@
     }
 
     /**
-     * Returns the space-before conditionality for this area.
-     * @return The space-before conditionality for this area.
-     * @see Fo#traitSpaceBeforeConditionality(FoContext)
-     */
-    public Conditionality traitSpaceBeforeConditionality() {
-        return traitGeneratedBy().traitSpaceBeforeConditionality(this);
-    }
-
-    /**
-     * Returns the space-before precedence for this area.
-     * @return The space-before precedence for this area.
-     * @see Fo#traitSpaceBeforePrecedence()
-     */
-    public int traitSpaceBeforePrecedence() {
-        return traitGeneratedBy().traitSpaceBeforePrecedence();
-    }
-
-    /**
      * Returns the space-after minimum trait for this area.
      * @return The space-after minimum trait for this area.
      * @see Fo#traitSpaceAfterMinimum(FoContext)
@@ -852,24 +834,6 @@
     }
 
     /**
-     * Returns the space-after conditionality for this area.
-     * @return The space-after conditionality for this area.
-     * @see Fo#traitSpaceAfterConditionality(FoContext)
-     */
-    public Conditionality traitSpaceAfterConditionality() {
-        return traitGeneratedBy().traitSpaceAfterConditionality(this);
-    }
-
-    /**
-     * Returns the space-after precedence for this area.
-     * @return The space-after precedence for this area.
-     * @see Fo#traitSpaceAfterPrecedence()
-     */
-    public int traitSpaceAfterPrecedence() {
-        return traitGeneratedBy().traitSpaceAfterPrecedence();
-    }
-
-    /**
      * Returns the space-start optimum trait for this area.
      * @return The space-start optimum trait for this area.
      * @see Fo#traitSpaceStartOptimum(FoContext)

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-07-16 20:32:32 UTC (rev 10003)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2007-07-16 20:41:06 UTC (rev 10004)
@@ -1139,14 +1139,16 @@
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the space-before conditionality for this area.
+     * @return The space-before conditionality for this area.
      */
     public Conditionality traitSpaceBeforeConditionality() {
         return traitGeneratedBy().traitHalfLeadingConditionality(this);
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the space-before precedence for this area.
+     * @return The space-before precedence for this area.
      */
     public int traitSpaceBeforePrecedence() {
         return traitGeneratedBy().traitHalfLeadingPrecedence(this);
@@ -1186,14 +1188,16 @@
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the space-after conditionality for this area.
+     * @return The space-after conditionality for this area.
      */
     public Conditionality traitSpaceAfterConditionality() {
         return traitGeneratedBy().traitHalfLeadingConditionality(this);
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the space-after precedence for this area.
+     * @return The space-after precedence for this area.
      */
     public int traitSpaceAfterPrecedence() {
         return traitGeneratedBy().traitHalfLeadingPrecedence(this);

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-16 20:32:32 UTC (rev 10003)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-16 20:41:06 UTC (rev 10004)
@@ -106,6 +106,7 @@
 import org.axsl.fo.fo.prop.CommonBorderPaddingBgPa;
 import org.axsl.fo.fo.prop.CommonFontPa;
 import org.axsl.fo.fo.prop.CommonHyphenationPa;
+import org.axsl.fo.fo.prop.CommonMarginBlockPa;
 import org.axsl.fo.fo.prop.HyphenationLadderCountPa;
 import org.axsl.font.Font;
 import org.axsl.font.FontConsumer;
@@ -128,7 +129,7 @@
 public abstract class FObj extends FONode implements org.axsl.fo.Fo,
         CommonAccessibilityPa, CommonAbsolutePositionPa,
         CommonAuralPa, CommonBorderPaddingBgPa, CommonFontPa,
-        CommonHyphenationPa, HyphenationLadderCountPa {
+        CommonHyphenationPa, CommonMarginBlockPa, HyphenationLadderCountPa {
 
     /** A static empty and immutable list of children, suitable for return by
      * objects that have no children. */


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