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 vh...@apache.org on 2007/08/03 10:19:59 UTC
svn commit: r562383 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
Author: vhennebert
Date: Fri Aug 3 01:19:58 2007
New Revision: 562383
URL: http://svn.apache.org/viewvc?view=rev&rev=562383
Log:
Clean up:
- organize imports
- javadoc for getBreakBefore/After
- loop no longer necessary when calling TableCellLM.getNextKnuthElements
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java?view=diff&rev=562383&r1=562382&r2=562383
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java Fri Aug 3 01:19:58 2007
@@ -37,7 +37,6 @@
import org.apache.fop.layoutmgr.LayoutContext;
import org.apache.fop.layoutmgr.ListElement;
import org.apache.fop.layoutmgr.MinOptMaxUtil;
-import org.apache.fop.layoutmgr.Position;
import org.apache.fop.traits.MinOptMax;
class RowGroupLayoutManager {
@@ -66,6 +65,12 @@
this.tableStepper = tableStepper;
}
+ /**
+ *
+ * @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN},
+ * {@link Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, or
+ * {@link Constants#EN_ODD_PAGE}
+ */
int getBreakBefore() {
TableRow rowFO = rowGroup[0].getTableRow();
if (rowFO == null) {
@@ -75,6 +80,12 @@
}
}
+ /**
+ *
+ * @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN},
+ * {@link Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, or
+ * {@link Constants#EN_ODD_PAGE}
+ */
int getBreakAfter() {
TableRow rowFO = rowGroup[rowGroup.length - 1].getTableRow();
if (rowFO == null) {
@@ -98,8 +109,7 @@
context.setFlags(LayoutContext.KEEP_WITH_NEXT_PENDING, false);
//Element list creation
- createElementsForRowGroup(context, alignment, bodyType,
- returnList, rowGroup);
+ createElementsForRowGroup(context, alignment, bodyType, returnList);
//Handle keeps
if (context.isKeepWithNextPending()) {
@@ -233,8 +243,7 @@
* @param rowGroup row group to process
*/
private void createElementsForRowGroup(LayoutContext context, int alignment,
- int bodyType, LinkedList returnList,
- EffRow[] rowGroup) {
+ int bodyType, LinkedList returnList) {
log.debug("Handling row group with " + rowGroup.length + " rows...");
MinOptMax[] rowHeights = new MinOptMax[rowGroup.length];
MinOptMax[] explicitRowHeights = new MinOptMax[rowGroup.length];
@@ -298,13 +307,6 @@
//Get the element list for the cell contents
LinkedList elems = primary.getCellLM().getNextKnuthElements(
childLC, alignment);
- //Temporary? Multiple calls in case of break conditions.
- //TODO Revisit when table layout is restartable
- while (!primary.getCellLM().isFinished()) {
- LinkedList additionalElems = primary.getCellLM().getNextKnuthElements(
- childLC, alignment);
- elems.addAll(additionalElems);
- }
ElementListObserver.observe(elems, "table-cell", primary.getCell().getId());
if ((elems.size() > 0)
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org