Return-Path: Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Received: (qmail 96764 invoked from network); 24 Jan 2006 19:26:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Jan 2006 19:26:16 -0000 Received: (qmail 17820 invoked by uid 500); 24 Jan 2006 19:26:15 -0000 Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org Received: (qmail 17777 invoked by uid 500); 24 Jan 2006 19:26:14 -0000 Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: fop-dev@xmlgraphics.apache.org Delivered-To: mailing list fop-commits@xmlgraphics.apache.org Received: (qmail 17759 invoked by uid 99); 24 Jan 2006 19:26:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2006 11:26:14 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 24 Jan 2006 11:26:13 -0800 Received: (qmail 96076 invoked by uid 65534); 24 Jan 2006 19:25:53 -0000 Message-ID: <20060124192553.96057.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r371989 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf: RTFHandler.java rtflib/rtfdoc/RtfTable.java rtflib/rtfdoc/RtfTableRow.java rtflib/tools/TableContext.java Date: Tue, 24 Jan 2006 19:25:50 -0000 To: fop-commits@xmlgraphics.apache.org From: pherweg@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pherweg Date: Tue Jan 24 11:25:44 2006 New Revision: 371989 URL: http://svn.apache.org/viewcvs?rev=371989&view=rev Log: just a few changes in order to satisfy checkstyle Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=371989&r1=371988&r2=371989&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java Tue Jan 24 11:25:44 2006 @@ -137,6 +137,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startDocument() + * @throws SAXException In case of a IO-problem */ public void startDocument() throws SAXException { // TODO sections should be created @@ -151,6 +152,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endDocument() + * @throws SAXException In case of a IO-problem */ public void endDocument() throws SAXException { try { @@ -163,6 +165,7 @@ /** * @see org.apache.fop.fo.FOEventHandler + * @param pageSeq PageSequence that is starting */ public void startPageSequence(PageSequence pageSeq) { try { @@ -201,6 +204,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endPageSequence(PageSequence) + * @param pageSeq PageSequence that is ending */ public void endPageSequence(PageSequence pageSeq) { if (bDefer) { @@ -219,6 +223,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startFlow(Flow) + * @param fl Flow that is starting */ public void startFlow(Flow fl) { if (bDefer) { @@ -299,6 +304,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endFlow(Flow) + * @param fl Flow that is ending */ public void endFlow(Flow fl) { if (bDefer) { @@ -321,6 +327,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startBlock(Block) + * @param bl Block that is starting */ public void startBlock(Block bl) { if (bDefer) { @@ -354,6 +361,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endBlock(Block) + * @param bl Block that is ending */ public void endBlock(Block bl) { @@ -383,6 +391,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startBlockContainer(BlockContainer) + * @param blc BlockContainer that is starting */ public void startBlockContainer(BlockContainer blc) { if (bDefer) { @@ -414,6 +423,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endBlockContainer(BlockContainer) + * @param bl BlockContainer that is ending */ public void endBlockContainer(BlockContainer bl) { if (bDefer) { @@ -442,6 +452,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startTable(Table) + * @param tbl Table that is starting */ public void startTable(Table tbl) { if (bDefer) { @@ -469,6 +480,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endTable(Table) + * @param tbl Table that is ending */ public void endTable(Table tbl) { if (bDefer) { @@ -515,24 +527,28 @@ /** * @see org.apache.fop.fo.FOEventHandler#startHeader(TableBody) + * @param th TableBody that is starting */ public void startHeader(TableBody th) { } /** * @see org.apache.fop.fo.FOEventHandler#endHeader(TableBody) + * @param th TableBody that is ending */ public void endHeader(TableBody th) { } /** * @see org.apache.fop.fo.FOEventHandler#startFooter(TableBody) + * @param tf TableFooter that is starting */ public void startFooter(TableBody tf) { } /** * @see org.apache.fop.fo.FOEventHandler#endFooter(TableBody) + * @param tf TableFooter that is ending */ public void endFooter(TableBody tf) { } @@ -596,6 +612,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startBody(TableBody) + * @param tb TableBody that is starting */ public void startBody(TableBody tb) { if (bDefer) { @@ -615,6 +632,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endBody(TableBody) + * @param tb TableBody that is ending */ public void endBody(TableBody tb) { if (bDefer) { @@ -632,6 +650,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startRow(TableRow) + * @param tr TableRow that is starting */ public void startRow(TableRow tr) { if (bDefer) { @@ -662,6 +681,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endRow(TableRow) + * @param tr TableRow that is ending */ public void endRow(TableRow tr) { if (bDefer) { @@ -674,6 +694,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startCell(TableCell) + * @param tc TableCell that is starting */ public void startCell(TableCell tc) { if (bDefer) { @@ -743,6 +764,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endCell(TableCell) + * @param tc TableCell that is ending */ public void endCell(TableCell tc) { if (bDefer) { @@ -756,6 +778,7 @@ // Lists /** * @see org.apache.fop.fo.FOEventHandler#startList(ListBlock) + * @param lb ListBlock that is starting */ public void startList(ListBlock lb) { if (bDefer) { @@ -784,6 +807,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endList(ListBlock) + * @param lb ListBlock that is ending */ public void endList(ListBlock lb) { if (bDefer) { @@ -795,6 +819,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startListItem(ListItem) + * @param li ListItem that is starting */ public void startListItem(ListItem li) { if (bDefer) { @@ -820,6 +845,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endListItem(ListItem) + * @param li ListItem that is ending */ public void endListItem(ListItem li) { if (bDefer) { @@ -902,6 +928,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startLink(BasicLink basicLink) + * @param basicLink BasicLink that is starting */ public void startLink(BasicLink basicLink) { if (bDefer) { @@ -947,6 +974,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#image(ExternalGraphic) + * @param eg ExternalGraphic that is starting */ public void image(ExternalGraphic eg) { if (bDefer) { @@ -1063,12 +1091,14 @@ /** * @see org.apache.fop.fo.FOEventHandler#foreignObject(InstreamForeignObject) + * @param ifo InstreamForeignObject that is starting */ public void foreignObject(InstreamForeignObject ifo) { } /** * @see org.apache.fop.fo.FOEventHandler#startFootnote(Footnote) + * @param footnote Footnote that is starting */ public void startFootnote(Footnote footnote) { if (bDefer) { @@ -1098,6 +1128,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endFootnote(Footnote) + * @param footnote Footnote that is ending */ public void endFootnote(Footnote footnote) { if (bDefer) { @@ -1109,6 +1140,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#startFootnoteBody(FootnoteBody) + * @param body FootnoteBody that is starting */ public void startFootnoteBody(FootnoteBody body) { if (bDefer) { @@ -1134,6 +1166,7 @@ /** * @see org.apache.fop.fo.FOEventHandler#endFootnoteBody(FootnoteBody) + * @param body FootnoteBody that is ending */ public void endFootnoteBody(FootnoteBody body) { if (bDefer) { @@ -1159,12 +1192,16 @@ /** * @see org.apache.fop.fo.FOEventHandler#leader(Leader) + * @param l Leader that is starting */ public void leader(Leader l) { } /** - * @see org.apache.fop.fo.FOEventHandler#characters(char[], int, int) + * @param text FOText object + * @param data Array of characters to process. + * @param start Offset for characters to process. + * @param length Portion of array to process. */ public void text(FOText text, char[] data, int start, int length) { if (bDefer) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java?rev=371989&r1=371988&r2=371989&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java Tue Jan 24 11:25:44 2006 @@ -152,6 +152,10 @@ headerAttribs = attrs; } + /** + * + * @return RtfAttributes of Header + */ public RtfAttributes getHeaderAttribs() { return headerAttribs; } @@ -190,6 +194,10 @@ return false; } + /** + * + * @return Parent row table (for nested tables only) + */ public RtfTableRow getRow() { RtfElement e = this; while (e.parent != null) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java?rev=371989&r1=371988&r2=371989&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java Tue Jan 24 11:25:44 2006 @@ -146,6 +146,10 @@ super.writeRtfContent(); } + /** + * + * @throws IOException In case of a IO-problem + */ public void writeRowAndCellsDefintions() throws IOException { // render the row and cells definitions writeControlWord("trowd"); @@ -190,36 +194,36 @@ // Added by Normand Masse // Adjust the cell's display attributes so the table's/row's borders // are drawn properly. - RtfTableCell cell = (RtfTableCell)e; + RtfTableCell rtfcell = (RtfTableCell)e; if (index == 0) { - if (!cell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_LEFT)) { - cell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_LEFT, + if (!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_LEFT)) { + rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_LEFT, (String)attrib.getValue(ITableAttributes.ROW_BORDER_LEFT)); } } if (index == this.getChildCount() - 1) { - if (!cell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_RIGHT)) { - cell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_RIGHT, + if (!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_RIGHT)) { + rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_RIGHT, (String)attrib.getValue(ITableAttributes.ROW_BORDER_RIGHT)); } } if (isFirstRow()) { - if (!cell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_TOP)) { - cell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_TOP, + if (!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_TOP)) { + rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_TOP, (String)attrib.getValue(ITableAttributes.ROW_BORDER_TOP)); } } if ((parentTable != null) && (parentTable.isHighestRow(id))) { - if (!cell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_BOTTOM)) { - cell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_BOTTOM, + if (!rtfcell.getRtfAttributes().isSet(ITableAttributes.CELL_BORDER_BOTTOM)) { + rtfcell.getRtfAttributes().set(ITableAttributes.CELL_BORDER_BOTTOM, (String)attrib.getValue(ITableAttributes.ROW_BORDER_BOTTOM)); } } - xPos = cell.writeCellDef(xPos); + xPos = rtfcell.writeCellDef(xPos); } index++; // Added by Boris POUDEROUS on 2002/07/02 } @@ -315,13 +319,17 @@ } /** - * @param id cell id to check + * @param cellId cell id to check * @return true if the cell is the highest cell */ - public boolean isHighestCell(int id) { - return (highestCell == id) ? true : false; + public boolean isHighestCell(int cellId) { + return (highestCell == cellId) ? true : false; } + /** + * + * @return Parent table of the row. + */ public RtfTable getTable() { RtfElement e = this; while (e.parent != null) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java?rev=371989&r1=371988&r2=371989&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java Tue Jan 24 11:25:44 2006 @@ -64,36 +64,63 @@ private boolean bNextRowBelongsToHeader = false; + /** + * + * @param value Specifies, if next row belongs to header + */ public void setNextRowBelongsToHeader(boolean value) { this.bNextRowBelongsToHeader = value; } + /** + * + * @return true, if next row belongs to header + */ public boolean getNextRowBelongsToHeader() { return bNextRowBelongsToHeader; } + /** + * + * @param ctx BuilderContext + */ public TableContext(BuilderContext ctx) { context = ctx; } + /** + * + * @param width Width of next column + * @throws Exception + */ public void setNextColumnWidth(Float width) throws Exception { colWidths.add(width); } - //Added by Peter Herweg on 2002-06-29 + /** + * + * @return RtfAttributes of current row-spanning cell + */ public RtfAttributes getColumnRowSpanningAttrs() { return (RtfAttributes)colRowSpanningAttrs.get(colIndex); } - //Added by Peter Herweg on 2002-06-29 + /** + * + * @return Number of currently spanned rows + */ public Integer getColumnRowSpanningNumber() { return (Integer)colRowSpanningNumber.get(colIndex); } - //Added by Peter Herweg on 2002-06-29 - public void setCurrentColumnRowSpanning(Integer iRowSpanning, RtfAttributes attrs) - throws Exception { + /** + * + * @param iRowSpanning number of rows to span + * @param attrs RtfAttributes of row-spanning cell + */ + public void setCurrentColumnRowSpanning( + Integer iRowSpanning, RtfAttributes attrs) { if (colIndex < colRowSpanningNumber.size()) { colRowSpanningNumber.set(colIndex, iRowSpanning); @@ -104,7 +131,11 @@ } } - //Added by Peter Herweg on 2002-06-29 + /** + * + * @param iRowSpanning number of rows to span in next column + * @param attrs RtfAttributes of row-spanning cell + */ public void setNextColumnRowSpanning(Integer iRowSpanning, RtfAttributes attrs) { colRowSpanningNumber.add(iRowSpanning); --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org