cvs commit: xml-fop/src/java/org/apache/fop/fo FObjMixed.java FONode.java
jeremias2005/02/01 13:21:28 Modified:src/java/org/apache/fop/fo FObjMixed.java FONode.java Log: Name of parameter was wrong. Some style updates while at it. Revision ChangesPath 1.47 +9 -7 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java Index: FObjMixed.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- FObjMixed.java6 Jan 2005 00:56:26 - 1.46 +++ FObjMixed.java1 Feb 2005 21:21:28 - 1.47 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,6 @@ package org.apache.fop.fo; -import java.util.List; - import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; @@ -38,15 +36,19 @@ } /** + * Adds characters * @param data array of characters containing text to be added * @param start starting array element to add - * @param length number of characters to add - * @param locator location in fo source file. + * @param end ending array element to add + * @param pList currently applicable PropertyList + * @param locator location in fo source file. + * @throws FOPException if there's a problem during processing + * @see org.apache.fop.fo.FONode#addCharacters(char[], int, int, org.apache.fop.fo.PropertyList, org.xml.sax.Locator) */ -protected void addCharacters(char data[], int start, int length, +protected void addCharacters(char[] data, int start, int end, PropertyList pList, Locator locator) throws FOPException { -FOText ft = new FOText(data, start, length, this); +FOText ft = new FOText(data, start, end, this); ft.setLocator(locator); ft.bind(pList); ft.startOfNode(); 1.53 +9 -8 xml-fop/src/java/org/apache/fop/fo/FONode.java Index: FONode.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- FONode.java 9 Jan 2005 12:47:40 - 1.52 +++ FONode.java 1 Feb 2005 21:21:28 - 1.53 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.apache.fop.fo; // Java -import java.util.List; import java.util.ListIterator; import org.xml.sax.Attributes; @@ -136,7 +135,7 @@ */ public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList parent) throws FOPException { -System.out.println("name = " + elementName); +log.debug("name = " + elementName); } /** @@ -165,12 +164,14 @@ /** * Adds characters (does nothing here) - * @param data text - * @param start start position - * @param length length of the text - * @param locator location in fo source file. + * @param data array of characters containing text to be added + * @param start starting array element to add + * @param end ending array element to add + * @param pList currently applicable PropertyList + * @param locator location in fo source file. + * @throws FOPException if there's a problem during processing */ -protected void addCharacters(char data[], int start, int length, +protected void addCharacters(char[] data, int start, int end, PropertyList pList, Locator locator) throws FOPException { // ignore - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FObjMixed.java FOText.java
jeremias2004/09/11 10:11:59 Modified:src/java/org/apache/fop/fo/flow PageNumber.java BlockContainer.java InlineContainer.java Block.java TableBody.java Footnote.java TableRow.java BidiOverride.java TableCell.java RetrieveMarker.java BasicLink.java Character.java ListItem.java ListBlock.java PageNumberCitation.java src/java/org/apache/fop/fo/pagination Flow.java src/java/org/apache/fop/fo FObjMixed.java FOText.java Log: Removed tab characters. Revision ChangesPath 1.38 +4 -1 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java Index: PageNumber.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- PageNumber.java 6 Sep 2004 18:44:31 - 1.37 +++ PageNumber.java 11 Sep 2004 17:11:58 - 1.38 @@ -93,11 +93,14 @@ /** * @see org.apache.fop.fo.FObj#addLayoutManager(List) */ -public void addLayoutManager(List list) { +public void addLayoutManager(List list) { PageNumberLayoutManager lm = new PageNumberLayoutManager(this); list.add(lm); } +/** + * @see org.apache.fop.fo.FONode#getName() + */ public String getName() { return "fo:page-number"; } 1.23 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java Index: BlockContainer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- BlockContainer.java 30 Aug 2004 12:00:52 - 1.22 +++ BlockContainer.java 11 Sep 2004 17:11:58 - 1.23 @@ -85,7 +85,7 @@ /** * @see org.apache.fop.fo.FObj#addLayoutManager(List) */ -public void addLayoutManager(List list) { +public void addLayoutManager(List list) { BlockContainerLayoutManager blm = new BlockContainerLayoutManager(this); blm.setOverflow(getPropEnum(PR_OVERFLOW)); list.add(blm); 1.19 +4 -1 xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java Index: InlineContainer.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- InlineContainer.java 25 Aug 2004 05:03:06 - 1.18 +++ InlineContainer.java 11 Sep 2004 17:11:58 - 1.19 @@ -55,13 +55,16 @@ /** * @see org.apache.fop.fo.FObj#addLayoutManager(List) */ -public void addLayoutManager(List list) { +public void addLayoutManager(List list) { ArrayList childList = new ArrayList(); super.addLayoutManager(childList); LayoutManager lm = new ICLayoutManager(this, childList); list.add(lm); } +/** + * @see org.apache.fop.fo.FONode#getName() + */ public String getName() { return "fo:inline-container"; } 1.40 +4 -1 xml-fop/src/java/org/apache/fop/fo/flow/Block.java Index: Block.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Block.java6 Sep 2004 18:44:31 - 1.39 +++ Block.java11 Sep 2004 17:11:58 - 1.40 @@ -344,11 +344,14 @@ /** * @see org.apache.fop.fo.FObj#addLayoutManager(List) */ -public void addLayoutManager(List list) { +public void addLayoutManager(List list) { BlockLayoutManager blm = new BlockLayoutManager(this); list.add(blm); } +/** + * @see org.apache.fop.fo.FONode#getName() + */ public String getName() { return "fo:block"; } 1.29 +1 -1 xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java Index: TableBody.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- TableBody.java7 Sep 2004 20:47:10 - 1.28 +++ TableBody.java11 Sep 2004 17:11:58 - 1.29 @@ -67,7 +67,7 @@ /** * @see org.apache.fop.fo.FObj#addLayo
cvs commit: xml-fop/src/java/org/apache/fop/fo FObjMixed.java
gmazza 2004/08/21 18:56:33 Modified:src/java/org/apache/fop/apps CommandLineOptions.java src/java/org/apache/fop/fo FObjMixed.java Log: Minor edits. Revision ChangesPath 1.28 +3 -11 xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java Index: CommandLineOptions.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/CommandLineOptions.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- CommandLineOptions.java 25 Jul 2004 17:04:44 - 1.27 +++ CommandLineOptions.java 22 Aug 2004 01:56:33 - 1.28 @@ -500,14 +500,6 @@ } /** - * Returns the input mode (type of input data, ex. NOT_SET or FO_INPUT) - * @return the input mode - */ -public int getInputMode() { -return inputmode; -} - -/** * Returns the output mode (output format, ex. NOT_SET or RENDER_PDF) * @return the output mode */ @@ -556,7 +548,7 @@ } /** - * Indicates whether the XML renderer should generate course area XML + * Indicates whether the XML renderer should generate coarse area XML * @return true if coarse area XML is desired */ public Boolean isCoarseAreaXml() { @@ -596,8 +588,8 @@ + " -fo infile xsl:fo input file \n" + " -xml infile xml input file, must be used together with -xsl \n" + " -xsl stylesheet xslt stylesheet \n \n" -/*+ " -param name value to use for parameter in xslt stylesheet\n" -+ "(repeat '-param name value' for each parameter)\n \n" */ ++ " -param name value to use for parameter in xslt stylesheet\n" ++ "(repeat '-param name value' for each parameter)\n \n" + " [OUTPUT] \n" + " outfile input will be rendered as pdf file into outfile \n" + " -pdf outfile input will be rendered as pdf file (outfile req'd) \n" 1.34 +0 -2 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java Index: FObjMixed.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- FObjMixed.java14 Aug 2004 18:36:21 - 1.33 +++ FObjMixed.java22 Aug 2004 01:56:33 - 1.34 @@ -57,9 +57,7 @@ FOText ft = new FOText(data, start, length, textInfo, this); ft.setLocation(locator); -/* characters() processing empty for FOTreeHandler, not empty for RTF & MIFHandlers */ getFOInputHandler().characters(ft.ca, ft.startIndex, ft.endIndex); - addChildNode(ft); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]