You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/03/18 09:08:25 UTC

cvs commit: xml-fop/src/java/org/apache/fop/fo/flow BlockContainer.java Block.java

jeremias    2005/03/18 00:08:25

  Modified:    src/java/org/apache/fop/fo/flow BlockContainer.java
                        Block.java
  Log:
  More accessors on block-containers.
  Javadocs touch-up
  
  Revision  Changes    Path
  1.37      +35 -10    xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java
  
  Index: BlockContainer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- BlockContainer.java	5 Mar 2005 04:52:06 -0000	1.36
  +++ BlockContainer.java	18 Mar 2005 08:08:25 -0000	1.37
  @@ -38,7 +38,7 @@
    */
   public class BlockContainer extends FObj {
       // The value of properties relevant for fo:block-container.
  -    private CommonAbsolutePosition commonAbsolutePosition ;
  +    private CommonAbsolutePosition commonAbsolutePosition;
       private CommonBorderPaddingBackground commonBorderPaddingBackground;
       private CommonMarginBlock commonMarginBlock;
       private LengthRangeProperty blockProgressionDimension;
  @@ -146,28 +146,28 @@
       }
   
       /**
  -     * Return the Common Absolute Position Properties.
  +     * @return the Common Absolute Position Properties.
        */
       public CommonAbsolutePosition getCommonAbsolutePosition() {
           return commonAbsolutePosition;
       }
       
       /**
  -     * Return the Common Margin Properties-Block.
  +     * @return the Common Margin Properties-Block.
        */
       public CommonMarginBlock getCommonMarginBlock() {
           return commonMarginBlock;
       }
   
       /**
  -     * Return the Common Border, Padding, and Background Properties.
  +     * @return the Common Border, Padding, and Background Properties.
        */
       public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
           return commonBorderPaddingBackground;
       }
   
       /**
  -     * Return the "block-progression-dimension" property.
  +     * @return the "block-progression-dimension" property.
        */
       public LengthRangeProperty getBlockProgressionDimension() {
           return blockProgressionDimension;
  @@ -178,36 +178,61 @@
           return displayAlign;
       }
       
  +    /** @return the "break-after" property. */
  +    public int getBreakAfter() {
  +        return breakAfter;
  +    }
  +
  +    /** @return the "break-before" property. */
  +    public int getBreakBefore() {
  +        return breakBefore;
  +    }
  +
  +    /** @return the "keep-with-next" property.  */
  +    public KeepProperty getKeepWithNext() {
  +        return keepWithNext;
  +    }
  +
  +    /** @return the "keep-with-previous" property.  */
  +    public KeepProperty getKeepWithPrevious() {
  +        return keepWithPrevious;
  +    }
  +
  +    /** @return the "keep-together" property.  */
  +    public KeepProperty getKeepTogether() {
  +        return keepTogether;
  +    }
  +
       /**
  -     * Return the "id" property.
  +     * @return the "id" property.
        */
       public String getId() {
           return id;
       }
   
       /**
  -     * Return the "inline-progression-dimension" property.
  +     * @return the "inline-progression-dimension" property.
        */
       public LengthRangeProperty getInlineProgressionDimension() {
           return inlineProgressionDimension;
       }
   
       /**
  -     * Return the "overflow" property.
  +     * @return the "overflow" property.
        */
       public int getOverflow() {
           return overflow;
       }
   
       /**
  -     * Return the "reference-orientation" property.
  +     * @return the "reference-orientation" property.
        */
       public int getReferenceOrientation() {
           return referenceOrientation.getValue();
       }
   
       /**
  -     * Return the "span" property.
  +     * @return the "span" property.
        */
       public int getSpan() {
           return this.span;
  
  
  
  1.54      +13 -17    xml-fop/src/java/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Block.java	11 Mar 2005 13:27:37 -0000	1.53
  +++ Block.java	18 Mar 2005 08:08:25 -0000	1.54
  @@ -179,43 +179,39 @@
       }
   
       /**
  -     * Return the Common Margin Properties-Block.
  +     * @return the Common Margin Properties-Block.
        */
       public CommonMarginBlock getCommonMarginBlock() {
           return commonMarginBlock;
       }
   
       /**
  -     * Return the Common Border, Padding, and Background Properties.
  +     * @return the Common Border, Padding, and Background Properties.
        */
       public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
           return commonBorderPaddingBackground;
       }
   
       /**
  -     * Return the Common Font Properties.
  +     * @return the Common Font Properties.
        */
       public CommonFont getCommonFont() {
           return commonFont;
       }
   
       /**
  -     * Return the Common Hyphenation Properties.
  +     * @return the Common Hyphenation Properties.
        */
       public CommonHyphenation getCommonHyphenation() {
           return commonHyphenation;
       }
   
  -    /**
  -     * Return the "break-after" property.
  -     */
  +    /** @return the "break-after" property. */
       public int getBreakAfter() {
           return breakAfter;
       }
   
  -    /**
  -     * Return the "break-before" property.
  -     */
  +    /** @return the "break-before" property. */
       public int getBreakBefore() {
           return breakBefore;
       }
  @@ -251,49 +247,49 @@
       }
   
       /**
  -     * Return the "color" property.
  +     * @return the "color" property.
        */
       public ColorType getColor() {
           return color;
       }
   
       /**
  -     * Return the "id" property.
  +     * @return the "id" property.
        */
       public String getId() {
           return id;
       }
   
       /**
  -     * Return the "line-height" property.
  +     * @return the "line-height" property.
        */
       public SpaceProperty getLineHeight() {
           return lineHeight;
       }
   
       /**
  -     * Return the "span" property.
  +     * @return the "span" property.
        */
       public int getSpan() {
           return this.span;
       }
   
       /**
  -     * Return the "text-align" property.
  +     * @return the "text-align" property.
        */
       public int getTextAlign() {
           return textAlign;
       }
   
       /**
  -     * Return the "text-align-last" property.
  +     * @return the "text-align-last" property.
        */
       public int getTextAlignLast() {
           return textAlignLast;
       }
   
       /**
  -     * Return the "text-indent" property.
  +     * @return the "text-indent" property.
        */
       public Length getTextIndent() {
           return textIndent;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org