svn commit: r610886 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table: RowPainter.java TableContentLayoutManager.java

[vhennebert]

Author: vhennebert
Date: Thu Jan 10 11:23:56 2008
New Revision: 610886

URL: http://svn.apache.org/viewvc?rev=610886&view=rev
Log:
Removed endPart() method and moved its content into addAreasAndFlushRow()

Modified:
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=610886&r1=610885&r2=610886&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java 
Thu Jan 10 11:23:56 2008
@@ -187,8 +187,10 @@
             // (header, footer, body) has been reached, and the next row will 
anyway be
             // different from the current one, and this is unnecessary to 
recall this
             // method in the first lines of handleTableContentPosition, so we 
may reset
-            // lastRow
+            // the following variables
             lastRow = null;
+            firstRowIndex = -1;
+            rowOffsets.clear();
         }
         return actualRowHeight;
     }
@@ -357,10 +359,5 @@
      */
     private int getRowOffset(int rowIndex) {
         return ((Integer) rowOffsets.get(rowIndex - firstRowIndex)).intValue();
-    }
-
-    void endPart() {
-        firstRowIndex = -1;
-        rowOffsets.clear();
     }
 }

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=610886&r1=610885&r2=610886&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
 Thu Jan 10 11:23:56 2008
@@ -418,7 +418,6 @@
             handleMarkersAndPositions(lst, body, firstPos, false, painter);
         }
         painter.addAreasAndFlushRow(true);
-        painter.endPart();
     }
 
     private void handleMarkersAndPositions(List positions, TableBody body, 
boolean firstPos,



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]