cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java package.html
gmazza 2003/11/04 15:59:14 Modified:.build.xml src/java/org/apache/fop/apps Driver.java Added: src/java/org/apache/fop/render/rtf BuilderContext.java FoUnitsConverter.java PageAttributesConverter.java RTFHandler.java TableAttributesConverter.java TableContext.java TextAttributesConverter.java src/java/org/apache/fop/render/rtf/rtflib/exceptions RtfException.java RtfStructureException.java package.html src/java/org/apache/fop/render/rtf/rtflib/interfaces ITableColumnsInfo.java package.html src/java/org/apache/fop/render/rtf/rtflib/rtfdoc BorderAttributesConverter.java IRtfAfterContainer.java IRtfBeforeContainer.java IRtfBookmarkContainer.java IRtfExternalGraphicContainer.java IRtfHyperLinkContainer.java IRtfJforCmdContainer.java IRtfListContainer.java IRtfOptions.java IRtfPageBreakContainer.java IRtfPageContainer.java IRtfPageNumberCitationContainer.java IRtfPageNumberContainer.java IRtfParagraphContainer.java IRtfParagraphKeepTogetherContainer.java IRtfTableContainer.java IRtfTextContainer.java IRtfTextrunContainer.java ITableAttributes.java IrtfTemplateContainer.java ParagraphKeeptogetherContext.java RtfAfter.java RtfAfterBeforeBase.java RtfAttributes.java RtfBefore.java RtfBookmark.java RtfBookmarkContainerImpl.java RtfColorTable.java RtfContainer.java RtfDocumentArea.java RtfElement.java RtfExternalGraphic.java RtfExtraRowSet.java RtfFile.java RtfFontManager.java RtfFontTable.java RtfHeader.java RtfHyperLink.java RtfJforCmd.java RtfLineBreak.java RtfList.java RtfListItem.java RtfListTable.java RtfNull.java RtfOptions.java RtfPage.java RtfPageArea.java RtfPageBreak.java RtfPageNumber.java RtfPageNumberCitation.java RtfParagraph.java RtfParagraphKeepTogether.java RtfSection.java RtfString.java RtfStringConverter.java RtfStyleSheetTable.java RtfTable.java RtfTableCell.java RtfTableRow.java RtfTemplate.java RtfText.java RtfTextrun.java WhitespaceCollapser.java package.html src/java/org/apache/fop/render/rtf/rtflib/testdocs BasicLink.java CreateTestDocuments.java DummyTableColumnsInfo.java ExternalGraphic.java ListInTable.java MergedTableCells.java NestedTable.java ParagraphAlignment.java SimpleDocument.java SimpleLists.java SimpleTable.java TestDocument.java TextAttributes.java Whitespace.java package.html src/java/org/apache/fop/render/rtf/rtflib/tools ImageConstants.java ImageUtil.java package.html Removed: src/java/org/apache/fop/rtf/renderer BuilderContext.java FoUnitsConverter.java PageAttributesConverter.java RTFHandler.java TableAttributesConverter.java TableContext.java TextAttributesConverter.java src/java/org/apache/fop/rtf/rtflib package.html src/java/org/apache/fop/rtf/rtflib/exceptions RtfException.java RtfStructureException.java package.html src/java/org/apache/fop/rtf/rtflib/interfaces ITableColumnsInfo.java package.html src/java/org/apache/fop/rtf/rtflib/rtfdoc BorderAttributesConverter.java IRtfAfterContainer.java IRtfBeforeContainer.java IRtfBookmarkContainer.java IRtfExternalGraphicContainer.java IRtfHyperLinkContainer.java IRtfJforCmdContainer.java IRtfListContainer.java IRtfOptions.java IRtfPageBreakContainer.java IRtfPageContainer.java IRtfPageNumberCitationContainer.java IRtfPageNumberContainer.java IRtfParagraphContainer.java
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java
vmote 2003/07/04 00:04:50 Modified:src/java/org/apache/fop/rtf/rtflib/interfaces ITableColumnsInfo.java src/java/org/apache/fop/rtf/rtflib/rtfdoc RtfTemplate.java RtfText.java src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java Log: style changes only, mostly javadoc comments and refactoring of names Revision ChangesPath 1.6 +2 -1 xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java Index: ITableColumnsInfo.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ITableColumnsInfo.java30 Jun 2003 22:00:53 - 1.5 +++ ITableColumnsInfo.java4 Jul 2003 07:04:49 - 1.6 @@ -63,6 +63,7 @@ */ public interface ITableColumnsInfo { +/** value for invalid column width */ float INVALID_COLUM_WIDTH = 200f; /** reset the column iteration index, meant to be called when creating a new row */ 1.5 +4 -4 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java Index: RtfTemplate.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfTemplate.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- RtfTemplate.java 30 Jun 2003 01:31:15 - 1.4 +++ RtfTemplate.java 4 Jul 2003 07:04:50 - 1.5 @@ -95,9 +95,9 @@ /** - *Set the template file and adjust tha path separator - * - [EMAIL PROTECTED] templateFilePath The full path of the template + * Set the template file and adjust tha path separator + * @param templateFilePath The full path of the template + * @throws IOException for I/O problems **/ public void setTemplateFilePath(String templateFilePath) throws IOException { // no validity checks here - leave this to the RTF client 1.6 +93 -48xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java Index: RtfText.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/RtfText.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RtfText.java 2 Jul 2003 16:59:54 - 1.5 +++ RtfText.java 4 Jul 2003 07:04:50 - 1.6 @@ -80,81 +80,113 @@ private static final int CHAR_BOLD_END = 131; /** members */ -private String m_text; -private final RtfAttributes m_attr; +private String text; +private final RtfAttributes attr; /** RtfText attributes: attribute names are RTF control word names to avoid * additional mapping */ +/** constant for bold */ public static final String ATTR_BOLD = b; +/** constant for italic */ public static final String ATTR_ITALIC = i; +/** constant for underline */ public static final String ATTR_UNDERLINE = ul; +/** constant for font size */ public static final String ATTR_FONT_SIZE = fs; +/** constant for font family */ public static final String ATTR_FONT_FAMILY = f; +/** constant for font color */ public static final String ATTR_FONT_COLOR = cf; +/** constant for background color */ public static final String ATTR_BACKGROUND_COLOR = chcbpat; // Added by Boris on 06/25//02 /** RtfText attributes: alignment attributes */ -public static String ALIGN_CENTER = qc; -public static String ALIGN_LEFT = ql; -public static String ALIGN_RIGHT = qr; -public static String ALIGN_JUSTIFIED = qj; -public static String ALIGN_DISTRIBUTED = qd; +/** constant for align center */ +public static final String ALIGN_CENTER = qc; +/** constant for align left */ +public static final String ALIGN_LEFT = ql; +/** constant for align right */ +public static final String ALIGN_RIGHT = qr; +/** constant for align justified */ +public static final String ALIGN_JUSTIFIED = qj; +/** constant for align distributed */ +public static final String ALIGN_DISTRIBUTED = qd; /** RtfText attributes: border attributes */ //added by Chris Scott -public static String BDR_BOTTOM_SINGLE = brdrb\\brsp40\\brdrs; -public static String BDR_BOTTOM_DOUBLE = brdrb\\brsp40\\brdrdb; -public static String BDR_BOTTOM_EMBOSS = brdrb\\brsp40\\brdremboss; -public static String BDR_BOTTOM_DOTTED = brdrb\\brsp40\\brdrdot; -public static String BDR_BOTTOM_DASH = brdrb\\brsp40\\brdrdash; +/** constant for bottom single
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java
vmote 2003/06/30 10:45:33 Modified:src/java/org/apache/fop/rtf/rtflib/rtfdoc IRtfPageNumberCitationContainer.java IRtfPageNumberContainer.java IRtfParagraphContainer.java IRtfParagraphKeepTogetherContainer.java IRtfTableContainer.java IRtfTextContainer.java IrtfTemplateContainer.java ParagraphKeeptogetherContext.java RtfAfter.java RtfAfterBeforeBase.java src/java/org/apache/fop/rtf/rtflib/testdocs BasicLink.java CreateTestDocuments.java DummyTableColumnsInfo.java ExternalGraphic.java ListInTable.java MergedTableCells.java NestedTable.java ParagraphAlignment.java SimpleDocument.java SimpleLists.java SimpleTable.java TestDocument.java TextAttributes.java Whitespace.java src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java Log: style changes only. Revision ChangesPath 1.3 +3 -4 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java Index: IRtfPageNumberCitationContainer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- IRtfPageNumberCitationContainer.java 29 Jun 2003 22:56:29 - 1.2 +++ IRtfPageNumberCitationContainer.java 30 Jun 2003 17:45:32 - 1.3 @@ -60,7 +60,6 @@ import java.io.IOException; -public interface IRtfPageNumberCitationContainer -{ -public RtfPageNumberCitation newPageNumberCitation(String id) throws IOException; +public interface IRtfPageNumberCitationContainer { +RtfPageNumberCitation newPageNumberCitation(String id) throws IOException; } 1.3 +3 -4 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java Index: IRtfPageNumberContainer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- IRtfPageNumberContainer.java 29 Jun 2003 22:56:29 - 1.2 +++ IRtfPageNumberContainer.java 30 Jun 2003 17:45:32 - 1.3 @@ -60,7 +60,6 @@ import java.io.IOException; -public interface IRtfPageNumberContainer -{ -public RtfPageNumber newPageNumber() throws IOException; +public interface IRtfPageNumberContainer { +RtfPageNumber newPageNumber() throws IOException; } 1.3 +4 -5 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java Index: IRtfParagraphContainer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- IRtfParagraphContainer.java 29 Jun 2003 22:56:29 - 1.2 +++ IRtfParagraphContainer.java 30 Jun 2003 17:45:32 - 1.3 @@ -64,12 +64,11 @@ * @author Bertrand Delacretaz [EMAIL PROTECTED] */ -public interface IRtfParagraphContainer -{ +public interface IRtfParagraphContainer { /** close current paragraph if any and start a new one with default attributes */ -public RtfParagraph newParagraph() throws IOException; +RtfParagraph newParagraph() throws IOException; /** close current paragraph if any and start a new one with specified attributes */ -public RtfParagraph newParagraph(RtfAttributes attr) throws IOException; +RtfParagraph newParagraph(RtfAttributes attr) throws IOException; } 1.3 +2 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java Index: IRtfParagraphKeepTogetherContainer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- IRtfParagraphKeepTogetherContainer.java 29 Jun 2003 22:56:29 - 1.2 +++ IRtfParagraphKeepTogetherContainer.java 30 Jun 2003 17:45:32 - 1.3 @@ -63,5 +63,5 @@ public interface IRtfParagraphKeepTogetherContainer { /** close current paragraph if any and start a new one */ -public RtfParagraphKeepTogether newParagraphKeepTogether() throws
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java
vmote 2003/06/30 15:01:03 Modified:src/java/org/apache/fop/rtf/rtflib/exceptions RtfException.java RtfStructureException.java src/java/org/apache/fop/rtf/rtflib/interfaces ITableColumnsInfo.java src/java/org/apache/fop/rtf/rtflib/testdocs BasicLink.java CreateTestDocuments.java MergedTableCells.java ParagraphAlignment.java SimpleTable.java TestDocument.java src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java Log: Refactor constants to conform to style guidelines. Add javadoc comments. Revision ChangesPath 1.4 +4 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java Index: RtfException.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RtfException.java 30 Jun 2003 01:31:13 - 1.3 +++ RtfException.java 30 Jun 2003 22:00:52 - 1.4 @@ -61,8 +61,10 @@ /** Base class for rtflib exceptions. * @author Bertrand Delacretaz [EMAIL PROTECTED] */ - public class RtfException extends java.io.IOException { +/** + * @param reason Description of reason for Exception. + */ public RtfException(String reason) { super(reason); } 1.4 +4 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java Index: RtfStructureException.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/exceptions/RtfStructureException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RtfStructureException.java30 Jun 2003 01:31:13 - 1.3 +++ RtfStructureException.java30 Jun 2003 22:00:53 - 1.4 @@ -61,9 +61,11 @@ /** Thrown when a method call would lead to an invalid RTF document structure. * @author Bertrand Delacretaz [EMAIL PROTECTED] */ - public class RtfStructureException extends RtfException { +/** + * @param reason Description of reason for exception. + */ public RtfStructureException(String reason) { super(reason); } 1.5 +5 -5 xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java Index: ITableColumnsInfo.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ITableColumnsInfo.java30 Jun 2003 01:31:13 - 1.4 +++ ITableColumnsInfo.java30 Jun 2003 22:00:53 - 1.5 @@ -76,9 +76,9 @@ */ float getColumnWidth(); - /** @return current column iteration index */ - int getColumnIndex(); +/** @return current column iteration index */ +int getColumnIndex(); - /** @return number of columns */ - int getNumberOfColumns(); +/** @return number of columns */ +int getNumberOfColumns(); } 1.5 +6 -2 xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java Index: BasicLink.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/BasicLink.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BasicLink.java30 Jun 2003 17:45:33 - 1.4 +++ BasicLink.java30 Jun 2003 22:01:01 - 1.5 @@ -82,7 +82,11 @@ public BasicLink() { } -/** generate the body of the test document */ +/** generate the body of the test document + * @param rda RtfDocumentArea + * @param sect RtfSection + * @throws IOException for I/O Errors + */ protected void generateDocument(RtfDocumentArea rda, RtfSection sect) throws IOException { RtfParagraph p = sect.newParagraph (); p.newLineBreak(); 1.7 +12 -5 xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java Index: CreateTestDocuments.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/testdocs/CreateTestDocuments.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CreateTestDocuments.java 30 Jun 2003 17:45:33 - 1.6 +++ CreateTestDocuments.java 30 Jun 2003 22:01:01 - 1.7 @@ -68,10 +68,14 @@ */ public class
cvs commit: xml-fop/src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java
bdelacretaz2003/06/25 02:30:53 Modified:src/java/org/apache/fop/rtf/rtflib/interfaces ITableColumnsInfo.java src/java/org/apache/fop/rtf/rtflib/tools ImageConstants.java ImageUtil.java Log: Apache license added Revision ChangesPath 1.2 +54 -60 xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java Index: ITableColumnsInfo.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/rtflib/interfaces/ITableColumnsInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ITableColumnsInfo.java25 Jun 2003 09:01:17 - 1.1 +++ ITableColumnsInfo.java25 Jun 2003 09:30:52 - 1.2 @@ -1,75 +1,66 @@ -package org.apache.fop.rtf.rtflib.interfaces; +/* + * $Id$ + * + *The Apache Software License, Version 1.1 + * + * + * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modifica- + * tion, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + *this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + *this list of conditions and the following disclaimer in the documentation + *and/or other materials provided with the distribution. + * + * 3. The end-user documentation included with the redistribution, if any, must + *include the following acknowledgment: This product includes software + *developed by the Apache Software Foundation (http://www.apache.org/). + *Alternately, this acknowledgment may appear in the software itself, if + *and wherever such third-party acknowledgments normally appear. + * + * 4. The names FOP and Apache Software Foundation must not be used to + *endorse or promote products derived from this software without prior + *written permission. For written permission, please contact + *[EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called Apache, nor may + *Apache appear in their name, without prior written permission of the + *Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + * The RTF library of the FOP project consists of voluntary contributions made by + * many individuals on behalf of the Apache Software Foundation and was originally + * created by Bertrand Delacretaz [EMAIL PROTECTED] and contributors of + * the jfor project (www.jfor.org), who agreed to donate jfor to the FOP project. + * For more information on the Apache Software Foundation, please + * see http://www.apache.org/. + */ -/*- - * jfor - Open-Source XSL-FO to RTF converter - see www.jfor.org - * - * - * jfor Apache-Style Software License. - * Copyright (c) 2002 by the jfor project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following