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/04/06 15:08:35 UTC

cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table ColumnSetup.java

jeremias    2005/04/06 06:08:34

  Modified:    src/java/org/apache/fop/layoutmgr/table Tag:
                        Temp_KnuthStylePageBreaking ColumnSetup.java
  Log:
  Fix for logic error causing array index exceptions
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.2   +9 -3      xml-fop/src/java/org/apache/fop/layoutmgr/table/Attic/ColumnSetup.java
  
  Index: ColumnSetup.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Attic/ColumnSetup.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ColumnSetup.java	5 Apr 2005 15:42:44 -0000	1.1.2.1
  +++ ColumnSetup.java	6 Apr 2005 13:08:34 -0000	1.1.2.2
  @@ -80,10 +80,16 @@
           }
       }
   
  +    /**
  +     * Returns a column. If the index of the column is bigger than the number of explicitly
  +     * defined columns the last column is returned.
  +     * @param index index of the column (1 is the first column)
  +     * @return the requested column
  +     */
       public TableColumn getColumn(int index) {
           int size = columns.size();
  -        if (index > size - 1) {
  -            maxColIndexReferenced = index;
  +        if (index > size) {
  +            maxColIndexReferenced = Math.max(maxColIndexReferenced, index);
               return (TableColumn)columns.get(size - 1);
           } else {
               return (TableColumn)columns.get(index - 1);
  
  
  

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