|
From: <vic...@us...> - 2006-06-10 02:02:21
|
Revision: 7503 Author: victormote Date: 2006-06-09 19:02:16 -0700 (Fri, 09 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7503&view=rev Log Message: ----------- Conform to axsl change: Return the TableCells in a more convenient cast. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-10 02:02:09 UTC (rev 7502) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2006-06-10 02:02:16 UTC (rev 7503) @@ -125,7 +125,7 @@ } if (rowSpanMgr == null) { - rowSpanMgr = new RowSpanMgr(table.getTableColumns().size()); + rowSpanMgr = new RowSpanMgr(table.getTableColumns().length); } // if (this.isInListBody) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-10 02:02:09 UTC (rev 7502) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-06-10 02:02:16 UTC (rev 7503) @@ -32,10 +32,9 @@ import org.axsl.foR.FOContext; import org.axsl.foR.Keep; import org.axsl.foR.fo.TableCell; +import org.axsl.foR.fo.TableColumn; import org.axsl.foR.fo.TableRow; -import java.util.List; - public class TableRowPL extends FObjPL { private RowSpanMgr rowSpanMgr = null; @@ -64,8 +63,8 @@ */ private void initCellArray(FOContext context) throws AreaWException { TableRow node = getReal(); - List columns = node.getNearestTable(context).getTableColumns(); - cellArray = new RowCellArray(rowSpanMgr, columns.size()); + TableColumn[] columns = node.getNearestTable(context).getTableColumns(); + cellArray = new RowCellArray(rowSpanMgr, columns.length); int colNum = 1; for (int i = 0; i < getReal().getChildren().size(); i++) { colNum = cellArray.getNextFreeCell(colNum); @@ -85,7 +84,7 @@ + "positioned beyond number of columns"); } cellColNum = colNum; - } else if (cellColNum > columns.size()) { + } else if (cellColNum > columns.length) { // Explicit colomn number specification out of range, skip it. layout.getLogger().error("Cell (#" + i + ") explicitly " + "positioned beyond number of columns, dropped:\n" @@ -93,12 +92,12 @@ continue; } // see if it fits and doesn't overwrite anything - if (cellColNum + numCols - 1 > columns.size()) { + if (cellColNum + numCols - 1 > columns.length) { // Too many columns spanned. layout.getLogger().error("Cell (#" + i + ") spans columns " + "beyond available number, clipped:\n" + cell.getContextMessage()); - numCols = columns.size() - cellColNum + 1; + numCols = columns.length - cellColNum + 1; } // Check for overwriting other cells (returns false) if (cellArray.storeCell(cell, cellColNum, numCols) == false) { @@ -125,7 +124,7 @@ public int layout(Area area) throws AreaWException { TableRow node = getReal(); - List columns = node.getNearestTable(area).getTableColumns(); + TableColumn[] columns = node.getNearestTable(area).getTableColumns(); if (getProgress() == FONodePL.BREAK_AFTER) { return Status.OK; } @@ -168,7 +167,7 @@ * Pass column object to cell to get offset and width and border * info if borders are "collapsed". */ - for (int i = 0; i < columns.size(); i++) { + for (int i = 0; i < columns.length; i++) { TableCell cell; TableCellPL cellPL; ++iColIndex; @@ -227,7 +226,7 @@ // Only do this for "STARTCELL", ending spans are handled separately // What about empty cells? Yes, we should set their height too! - for (int iCol = 1; iCol <= columns.size(); iCol++) { + for (int iCol = 1; iCol <= columns.length; iCol++) { if (cellArray.getCellType(iCol) == RowCellArray.CELLSTART && rowSpanMgr.isSpanned(iCol) == false) { TableCell cell = cellArray.getCell(iCol); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-10 17:57:06
|
Revision: 7518 Author: victormote Date: 2006-06-10 10:56:59 -0700 (Sat, 10 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7518&view=rev Log Message: ----------- Remove unnecessary casts. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-10 17:56:51 UTC (rev 7517) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-10 17:56:59 UTC (rev 7518) @@ -215,7 +215,7 @@ // It did not fit on the line. Create new line & try again. NormalBlockArea blockArea = (NormalBlockArea) lineArea.getWritableParentArea(); - lineArea = (LineArea) blockArea.createNextLineArea(false); + lineArea = blockArea.createNextLineArea(false); BlockPL blockPL = this.layout.getBlockPL(blockArea); blockPL.currentLineArea = lineArea; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-06-10 17:56:51 UTC (rev 7517) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2006-06-10 17:56:59 UTC (rev 7518) @@ -49,7 +49,7 @@ FObj nextFObj = (FObj) children.get(i); org.axsl.areaW.SpanRA span = pc.startingReferenceArea(lastFObj, nextFObj); - NormalFlowRA nf = (NormalFlowRA) span.normalFlowForNextFO(nextFObj); + NormalFlowRA nf = span.normalFlowForNextFO(nextFObj); this.getLayoutProxy(nextFObj).layout(nf); } return 0; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-10 17:56:51 UTC (rev 7517) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-06-10 17:56:59 UTC (rev 7518) @@ -172,9 +172,8 @@ isBlankPage = true; } } - /* TODO: Remove cast from following line. */ - PageArea newPage = (PageArea) pageCollection.getNextPage(false, - false, isBlankPage); + PageArea newPage = pageCollection.getNextPage(false, false, + isBlankPage); setPendingFootnotes(newPage); currentPage = newPage; /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-13 20:21:50
|
Revision: 7564 Author: victormote Date: 2006-06-13 13:21:40 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7564&view=rev Log Message: ----------- Use new capabilities of the axsl interfaces to get a context-aware LineText item pushed through the line-breaking logic. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-13 20:19:22 UTC (rev 7563) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2006-06-13 20:21:40 UTC (rev 7564) @@ -30,14 +30,14 @@ import org.axsl.areaW.NormalBlockArea; import org.axsl.areaW.TableCellArea; import org.axsl.areaW.TableRowContainer; +import org.axsl.foR.FOLineNonText; +import org.axsl.foR.FOLineText; import org.axsl.foR.FONode; import org.axsl.foR.FObj; import org.axsl.foR.fo.RetrieveMarker; import org.axsl.foR.fo.TableCell; import org.axsl.text.TextException; import org.axsl.text.line.LineBreaker; -import org.axsl.text.line.LineNonText; -import org.axsl.text.line.LineText; import org.apache.commons.logging.Log; @@ -153,7 +153,7 @@ * @return The index into the text (char []) to the first character that * was <em>not</em> successfully added to the line. */ - protected int addTextItemToLine(LineArea lineArea, LineText lineText, + protected int addTextItemToLine(LineArea lineArea, FOLineText lineText, int start, int end, RetrieveMarker retrieveMarker) throws AreaWException { LineBreaker lb = layout.getLineBreaker(); @@ -162,13 +162,14 @@ lineArea.getFontConsumer()); } int status = 0; + FOLineText contextAware = lineText.getContextWrapper(retrieveMarker); try { - status = lb.processLineContent(lineText, start, end, + status = lb.processLineContent(contextAware, start, end, lineArea.asLineOutput(), retrieveMarker); } catch (TextException e) { FObj generatedBy = lineArea.traitGeneratedBy(); throw new AreaWException("Error in text layout:\n" - + generatedBy.getContextMessage()); + + generatedBy.getContextMessage(), e); } layout.setLineBreaker(lb); if (status >= end) { @@ -181,7 +182,7 @@ * @return For non-text items, returns 1 for success or 0 if the item did * not fit onto the current line. */ - protected int addNonTextItemToLine(LineArea lineArea, LineNonText nonText, + protected int addNonTextItemToLine(LineArea lineArea, FOLineNonText nonText, RetrieveMarker retrieveMarker) throws AreaWException { LineBreaker lb = layout.getLineBreaker(); @@ -190,8 +191,9 @@ lineArea.getFontConsumer()); } int status = 0; + FOLineNonText contextAware = nonText.getContextWrapper(retrieveMarker); try { - status = lb.processLineContent(nonText, -1, -1, + status = lb.processLineContent(contextAware, -1, -1, lineArea.asLineOutput(), retrieveMarker); } catch (TextException e) { FObj generatedBy = lineArea.traitGeneratedBy(); @@ -205,10 +207,10 @@ protected int layoutInlineContent(FObj node, LineArea lineArea, RetrieveMarker retrieveMarker) throws AreaWException { - if (! (node instanceof LineNonText)) { + if (! (node instanceof FOLineNonText)) { return -1000; } - LineNonText nonText = (LineNonText) node; + FOLineNonText nonText = (FOLineNonText) node; // this should start a new page if (lineArea == null) { return Status.AREA_FULL_SOME; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-13 20:19:22 UTC (rev 7563) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-13 20:21:40 UTC (rev 7564) @@ -25,13 +25,12 @@ package org.foray.pioneer; import org.axsl.areaW.Area; +import org.axsl.areaW.AreaWException; import org.axsl.areaW.LineArea; import org.axsl.areaW.NormalBlockArea; - -import org.axsl.areaW.AreaWException; +import org.axsl.foR.FOLineText; import org.axsl.foR.FOText; import org.axsl.foR.fo.RetrieveMarker; -import org.axsl.text.line.LineText; /** * @@ -71,7 +70,7 @@ * laid out. If the first six characters have been laid out (indices 0-5), * then 6 should be returned. */ - private int addText(LineText lineText, Area area, int start, + private int addText(FOLineText lineText, Area area, int start, RetrieveMarker retrieveMarker) throws AreaWException { int end = lineText.inlineText().length; LineArea la = this.activeLineArea(area); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-16 22:52:42
|
Revision: 7655 Author: victormote Date: 2006-06-16 15:52:37 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7655&view=rev Log Message: ----------- Conform to axsl changes: Remove unneeded method. Let the Area Tree worry about the vertical alignment of its LineAreas. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-16 22:49:37 UTC (rev 7654) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java 2006-06-16 22:52:37 UTC (rev 7655) @@ -174,7 +174,6 @@ if (this.currentLineArea == null) { return; } - this.currentLineArea.verticalAlign(); this.currentLineArea = null; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-16 22:49:37 UTC (rev 7654) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-06-16 22:52:37 UTC (rev 7655) @@ -81,7 +81,6 @@ start = addTextItemToLine(la, lineText, start, end, retrieveMarker); while (start != -1) { BlockPL blockPL = this.layout.getBlockPL(ba); - blockPL.getCurrentLineArea(ba).verticalAlign(); la = ba.createNextLineArea(false); blockPL.currentLineArea = la; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
