Now that there is a dedicated package for tables, the PendingSpan class can be extracted into a top-level class.

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

3 files changed, 40 insertions, 24 deletions

diff --git a/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java b/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
index 54830e318..9fbe415d8 100644
--- a/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
+++ b/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
@@ -22,7 +22,6 @@ package org.apache.fop.fo.flow.table;
 import java.util.BitSet;
 import java.util.List;
 
-import org.apache.fop.fo.flow.table.TableCellContainer.PendingSpan;
 
 
 /**
diff --git a/src/java/org/apache/fop/fo/flow/table/PendingSpan.java b/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
new file mode 100644
index 000000000..7d1b9c133
--- /dev/null
+++ b/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.fo.flow.table;
+
+/**
+ * Used for determining initial values for column-numbers in case of row-spanning cells.
+ */
+class PendingSpan {
+
+    /**
+     * member variable holding the number of rows left
+     */
+    int rowsLeft;
+
+    /**
+     * Constructor
+     * 
+     * @param rows  number of rows spanned
+     */
+    public PendingSpan(int rows) {
+        rowsLeft = rows;
+    }
+}
\ No newline at end of file
diff --git a/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java b/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
index 97de855b2..ebb066c5c 100644
--- a/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
@@ -31,29 +31,6 @@ import org.apache.fop.fo.ValidationException;
  */
 public abstract class TableCellContainer extends TableFObj implements ColumnNumberManagerHolder {
 
-    /**
-     * Used for determining initial values for column-numbers
-     * in case of row-spanning cells
-     * (for clarity)
-     *
-     */
-    static class PendingSpan {
-
-        /**
-         * member variable holding the number of rows left
-         */
-        protected int rowsLeft;
-
-        /**
-         * Constructor
-         * 
-         * @param rows  number of rows spanned
-         */
-        public PendingSpan(int rows) {
-            rowsLeft = rows;
-        }
-    }
-
     protected List pendingSpans;
 
     protected ColumnNumberManager columnNumberManager;