Merged revisions 651853,651855-651856,651866-651867,651880,651898 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r651853 | adelmelle | 2008-04-26 21:06:04 +0100 (Sat, 26 Apr 2008) | 3 lines
  
  Bugzilla 44203:
  Fixed a logic error in Hyphenator.java where an UnsupportedOperationException was erroneously thrown if the supplied source had an associated InputStream.
........
  r651855 | adelmelle | 2008-04-26 21:19:59 +0100 (Sat, 26 Apr 2008) | 3 lines
  
  Basic activation of keep-* properties on Character and AbstractGraphics
  + javadoc updates
........
  r651856 | adelmelle | 2008-04-26 21:21:44 +0100 (Sat, 26 Apr 2008) | 3 lines
  
  Basic activation on some widely used properties (prepare for implementation)
  + javadoc updates
........
  r651866 | adelmelle | 2008-04-26 23:08:10 +0100 (Sat, 26 Apr 2008) | 2 lines
  
  Javadoc updates: attempt at improving interactivity and consistency
........
  r651867 | adelmelle | 2008-04-27 00:07:51 +0100 (Sun, 27 Apr 2008) | 2 lines
  
  Minor refactoring: consolidate getPSLM().notifyEndOfLayout(fobj.getId()) in AbstractLayoutManager.notifyEndOfLayout()
........
  r651880 | clay | 2008-04-27 04:27:39 +0100 (Sun, 27 Apr 2008) | 1 line
  
  Updated to include dev (0.95beta) release.
........
  r651898 | adelmelle | 2008-04-27 09:18:31 +0100 (Sun, 27 Apr 2008) | 1 line
  
  Correction of r651866
........


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@652318 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 6 deletions

diff --git a/src/java/org/apache/fop/fo/flow/table/Table.java b/src/java/org/apache/fop/fo/flow/table/Table.java
index c1ef3857c..69d5fbb9d 100644
--- a/src/java/org/apache/fop/fo/flow/table/Table.java
+++ b/src/java/org/apache/fop/fo/flow/table/Table.java
@@ -39,7 +39,8 @@ import org.apache.fop.fo.properties.LengthRangeProperty;
 import org.apache.fop.fo.properties.TableColLength;
 
 /**
- * Class modelling the fo:table object.
+ * Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_table">
+ * <code>fo:table</code></a> object.
  */
 public class Table extends TableFObj implements ColumnNumberManagerHolder {
 
@@ -96,7 +97,10 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
     private PropertyList propList;
 
     /**
-     * @param parent FONode that is the parent of this object
+     * Construct a Table instance with the given {@link FONode}
+     * as parent.
+     *
+     * @param parent {@link FONode} that is the parent of this object
      */
     public Table(FONode parent) {
         super(parent);
@@ -163,7 +167,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
 
     /**
      * {@inheritDoc}
-     * XSL Content Model: (marker*,table-column*,table-header?,table-footer?,table-body+)
+     * <br>XSL Content Model: (marker*,table-column*,table-header?,table-footer?,table-body+)
      */
     protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
@@ -255,7 +259,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
             if (!inMarker()) {
                 addColumnNode((TableColumn) child);
             } else {
-                columns.add((TableColumn) child);
+                columns.add(child);
             }
             break;
         case FO_TABLE_HEADER:
@@ -344,7 +348,6 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
      * used for determining initial values for column-number
      * 
      * @param col   the column to add
-     * @throws FOPException
      */
     private void addColumnNode(TableColumn col) {
 
@@ -518,7 +521,10 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder {
         return "table";
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     * @return {@link org.apache.fop.fo.Constants#FO_TABLE}
+     */
     public int getNameId() {
         return FO_TABLE;
     }