Java 1.3 compatibility.

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

diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index f65a68f580f936791e0cf76025ff6e8e8c0c7a38..9373e6070b022cbc9de44e4ef844d2628b72e8c4 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -266,7 +266,9 @@ public class Table extends TableFObj {
             }
         }
         //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++;

diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java
index 8d8cd53a23a558619a3958748cb19b01dacecaab..bed35017c8f039a94bc5051391ab7ffe19b04a58 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/TableBody.java
@@ -211,7 +211,9 @@ public class TableBody extends TableFObj {
                 }
             }
         }
-        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 class TableBody extends TableFObj {
      */
     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 @@ public class TableBody extends TableFObj {
                     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();

diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index 3081e1632c649a20d358abc3b2156ce49bd7ffd0..2179b3f3ec17e89c221ae0a0e77ede689193de77 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -189,7 +189,9 @@ public class TableRow extends TableFObj {
                 }
             }
         }
-        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++;