From 2332ae0d9bffcd9c5882bda7d8ee1a1bb74bbf58 Mon Sep 17 00:00:00 2001
From: Jeremias Maerki <jeremias@apache.org>
Date: Fri, 18 Mar 2005 08:08:25 +0000
Subject: [PATCH] More accessors on block-containers. Javadocs touch-up

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198504 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/fop/fo/flow/Block.java    | 30 ++++++-------
 .../apache/fop/fo/flow/BlockContainer.java    | 45 ++++++++++++++-----
 2 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 011e1dbdb..73fd6bf9c 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -179,43 +179,39 @@ public class Block extends FObjMixed {
     }
 
     /**
-     * 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 @@ public class Block extends FObjMixed {
     }
 
     /**
-     * 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;
diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java
index d18c7fbfd..c7d1acd5d 100644
--- a/src/java/org/apache/fop/fo/flow/BlockContainer.java
+++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java
@@ -38,7 +38,7 @@ import org.apache.fop.fo.properties.LengthRangeProperty;
  */
 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 @@ public class BlockContainer extends FObj {
     }
 
     /**
-     * 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 @@ public class BlockContainer extends FObj {
         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;
-- 
2.39.5