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/09/22 17:29:51 UTC
svn commit: r290962 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow: Table.java
TableBody.java TableRow.java
Author: jeremias
Date: Thu Sep 22 08:29:47 2005
New Revision: 290962
URL: http://svn.apache.org/viewcvs?rev=290962&view=rev
Log:
Java 1.3 compatibility.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java?rev=290962&r1=290961&r2=290962&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java Thu Sep 22 08:29:47 2005
@@ -266,7 +266,9 @@
}
}
//flag column indices used by this column
- usedColumnIndices.set(colNumber - 1, colNumber - 1 + colRepeat);
+ for (int i = colNumber - 1; i < colNumber - 1 + colRepeat; i++) {
+ usedColumnIndices.set(i);
+ }
//set index for the next column to use
while( usedColumnIndices.get(columnIndex - 1) ) {
columnIndex++;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java?rev=290962&r1=290961&r2=290962&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java Thu Sep 22 08:29:47 2005
@@ -211,7 +211,9 @@
}
}
}
- usedColumnIndices.set(startIndex, endIndex);
+ for (int i = startIndex; i < endIndex; i++) {
+ usedColumnIndices.set(i);
+ }
setNextColumnIndex();
super.addChildNode(cell);
if (cell.endsRow()) {
@@ -337,7 +339,9 @@
*/
public void resetColumnIndex() {
columnIndex = 1;
- usedColumnIndices.clear();
+ for (int i = 0; i < usedColumnIndices.size(); i++) {
+ usedColumnIndices.clear(i);
+ }
PendingSpan pSpan;
for (int i = pendingSpans.size(); --i >= 0;) {
pSpan = (PendingSpan) pendingSpans.get(i);
@@ -347,7 +351,11 @@
pendingSpans.set(i, null);
}
}
- usedColumnIndices.set(i, pendingSpans.get(i) != null);
+ if (pendingSpans.get(i) != null) {
+ usedColumnIndices.set(i);
+ } else {
+ usedColumnIndices.clear(i);
+ }
}
if (!firstRow) {
setNextColumnIndex();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java?rev=290962&r1=290961&r2=290962&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java Thu Sep 22 08:29:47 2005
@@ -189,7 +189,9 @@
}
}
}
- usedColumnIndices.set(startIndex, endIndex);
+ for (int i = startIndex; i < endIndex; i++) {
+ usedColumnIndices.set(i);
+ }
//update columnIndex for the next cell
while (usedColumnIndices.get(columnIndex - 1)) {
columnIndex++;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org