xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r590177 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow: ColumnNumberManager.java TableFObj.java
Date Tue, 30 Oct 2007 17:42:11 GMT
Author: vhennebert
Date: Tue Oct 30 10:42:10 2007
New Revision: 590177

URL: http://svn.apache.org/viewvc?rev=590177&view=rev
Log:
Removed no longer useful setCurrentColumnIndex method on ColumnNumberManager. The column number
is now automatically updated in signalUsedColumnNumbers

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java?rev=590177&r1=590176&r2=590177&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ColumnNumberManager.java Tue Oct
30 10:42:10 2007
@@ -59,6 +59,7 @@
             usedColumnIndices.set(i);
         }
 
+        columnNumber = end + 1;
         while (usedColumnIndices.get(columnNumber - 1)) {
             columnNumber++;
         }
@@ -100,17 +101,6 @@
      */
     public boolean isColumnNumberUsed(int colNr) {
         return usedColumnIndices.get(colNr - 1);
-    }
-
-    /**
-     * Sets the current column index to a specific value
-     * (used by ColumnNumberPropertyMaker.make() in case the 
-     *  column-number was explicitly specified on the cell)
-     * 
-     * @param newIndex  the new column index
-     */
-    void setCurrentColumnIndex(int newIndex) {
-        columnNumber = newIndex;
     }
 
 }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java?rev=590177&r1=590176&r2=590177&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java Tue Oct 30 10:42:10
2007
@@ -165,8 +165,6 @@
                 }
             }
 
-            columnIndexManager.setCurrentColumnIndex(columnIndex);
-
             int colSpan = propertyList.get(Constants.PR_NUMBER_COLUMNS_SPANNED)
                                 .getNumeric().getValue();
             int i = -1;



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


Mime
View raw message