Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java Mon Oct 8 06:19:32 2018 @@ -27,7 +27,7 @@ import java.util.HashMap; /** * This class defines the precedence applied to each operator when performing a conversion - * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2 from infix to RPN.}. + * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler#infix2RPN from infix to RPN.}. */ public class PrecedenceTable { public static final int DEFAULT_PRECEDENCE = 0;
Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/SymbolLookup.java Mon Oct 8 06:19:32 2018 @@ -27,7 +27,7 @@ import java.util.HashMap; /** * This interface defines the attributes of a lookup table for this plugin. - * Symbols will generally be either operators (_, -, *, etc) or funtion names. + * Symbols will generally be either operators (_, -, *, etc) or function names. */ public abstract class SymbolLookup { @@ -44,7 +44,7 @@ public abstract class SymbolLookup { /** * Associate a symbol with a numeric value in the lookup table * @param symbol The symbol that will act as the key in the lookup table - * @param value The value to be associated with a given symbol + * @param id The value to be associated with a given symbol */ public void addEntry(String symbol, int id) { Integer iObj = new Integer(id); Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java Mon Oct 8 06:19:32 2018 @@ -284,7 +284,7 @@ public class TokenEncoder { /** * A Cell Reference Encoder (It supports absolute and relative addressing) * - * @param t <code>Token</code> to be encoded + * @param cellCoordinates * @return A <code>Vector</code> of pexcel <code>Byte</code> */ private byte[] encodeCellCoordinates(String cellCoordinates) { @@ -367,7 +367,7 @@ public class TokenEncoder { /** * This function will find the sheetname index for a given String * - * @param t <code>Token</code> to be encoded + * @param s * @return A <code>Vector</code> of pexcel <code>Byte</code> */ private short findSheetIndex(String s) { Modified: openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDescriptor.java Mon Oct 8 06:19:32 2018 @@ -130,7 +130,7 @@ class DocumentDescriptor { /* - * This method loads the intial fixed portion of the descriptor and the + * This method loads the initial fixed portion of the descriptor and the * mid-section. The mid-section is variable but Pocket Word doesn't seem * to mind default values. */ Modified: openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java Mon Oct 8 06:19:32 2018 @@ -69,7 +69,7 @@ public final class DocumentDeserializerI /** - * Initialises a new <code>DocumentDeserializerImpl</code> using the + * <p>Initialises a new <code>DocumentDeserializerImpl</code> using the * supplied <code>ConvertData</code>.</p> * * <p>The <code>Document</code> objects in the <code>ConvertData</code> Modified: openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentMergerImpl.java Mon Oct 8 06:19:32 2018 @@ -44,7 +44,7 @@ import org.openoffice.xmerge.util.Debug; * PocketWord implementation of <code>DocumentMerger</code> * for the {@link * org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl - * PluginFactoryImpl}.</p> + * PluginFactoryImpl}. */ public class DocumentMergerImpl implements DocumentMerger { Modified: openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentSerializerImpl.java Mon Oct 8 06:19:32 2018 @@ -48,7 +48,7 @@ import java.io.IOException; * org.openoffice.xmerge.converter.xml.sxw.pocketword.PluginFactoryImpl * PluginFactoryImpl}.</p> * - * <p>This converts an OpenOffice.org XML Writer files to a Pocket Word file<.</p> + * <p>This converts an OpenOffice.org XML Writer files to a Pocket Word file.</p> * * @author Mark Murnane * @version 1.1 @@ -72,7 +72,7 @@ public final class DocumentSerializerImp * org.openoffice.xmerge.converter.xml.sxw.SxwDocument SxwDocument} * object.</p> * - * @param document The <code>Document</code> to convert. + * @param doc The <code>Document</code> to convert. */ public DocumentSerializerImpl(Document doc) { sxwDoc = (SxwDocument)doc; Modified: openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PluginFactoryImpl.java Mon Oct 8 06:19:32 2018 @@ -90,11 +90,11 @@ public final class PluginFactoryImpl ext /** - * The <code>DocumentDeserializer</code> is used to convert + * <p>The <code>DocumentDeserializer</code> is used to convert * from the Pocket Word <code>Document</code> format to * the OpenOffice.org XML Writer <code>Document</code> format.</p> * - * The <code>ConvertData</code> object is passed along to the + * <p>The <code>ConvertData</code> object is passed along to the * created <code>DocumentDeserializer</code> via its constructor. * The <code>ConvertData</code> is read and converted when the * the <code>DocumentDeserializer</code> object's Modified: openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/PocketWordDocument.java Mon Oct 8 06:19:32 2018 @@ -101,7 +101,7 @@ public class PocketWordDocument implemen * <p>This method reads <code>byte</code> data from the InputStream and * extracts font and paragraph data from the file.</p> * - * @param is InputStream containing a Pocket Word data file. + * @param docData InputStream containing a Pocket Word data file. * * @throws IOException In case of any I/O errors. */ Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java Mon Oct 8 06:19:32 2018 @@ -161,7 +161,7 @@ public class Convert implements Cloneabl /** * Clones a Convert object so another Convert object can - * do the same conversion. <code>InputStream<code> objects passed + * do the same conversion. <code>InputStream</code> objects passed * in via calls to the <code>addInputStream</code> method are not * copied. * Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java Mon Oct 8 06:19:32 2018 @@ -28,13 +28,13 @@ import java.io.IOException; /** * <p>A <code>DocumentDeserializer</code> represents a converter that * converts "Device" <code>Document</code> objects into the - * "Office" <code>Document</code> format.</p> + * "Office" <code>Document</code> format. * * <p>The <code>DocumentDeserializer</code> object is created by - * the </code>PluginFactory</code> {@link + * the <code>PluginFactory</code> {@link * org.openoffice.xmerge.DocumentDeserializerFactory#createDocumentDeserializer * createDocumentDeserializer} method. When it is constructed, a - * <code>ConvertData</code> object is passed in to be used as input.</p> + * <code>ConvertData</code> object is passed in to be used as input. * * @author Herbie Ong * @see org.openoffice.xmerge.PluginFactory Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java Mon Oct 8 06:19:32 2018 @@ -38,11 +38,11 @@ package org.openoffice.xmerge; public interface DocumentDeserializerFactory { /** - * The <code>DocumentDeserializer</code> is used to convert + * <p>The <code>DocumentDeserializer</code> is used to convert * from the "Device" <code>Document</code> format to * the "Office" <code>Document</code> format.</p> * - * The <code>ConvertData</code> object is passed along to the + * <p>The <code>ConvertData</code> object is passed along to the * created <code>DocumentDeserializer</code> via its constructor. * The <code>ConvertData</code> is read and converted when the * the <code>DocumentDeserializer</code> object's Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java Mon Oct 8 06:19:32 2018 @@ -153,7 +153,7 @@ public class DOMDocument * Sets the Content of the <code>Document</code> to the contents of the * supplied <code>Node</code> list. * - * @return DOM <code>Document</code> object. + * @param newDom DOM <code>Document</code> object. */ public void setContentDOM( Node newDom) { contentDoc=(Document)newDom; Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java Mon Oct 8 06:19:32 2018 @@ -116,7 +116,7 @@ public class PalmDocument /** * Writes the <code>PalmDocument</code> to an <code>OutputStream</code>. * - * @param is The <code>OutputStream</code> to write the content. + * @param os The <code>OutputStream</code> to write the content. * * @throws IOException If any I/O error occurs. */ Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java Mon Oct 8 06:19:32 2018 @@ -31,16 +31,16 @@ import java.io.DataInputStream; /** * <p>Provides functionality to decode a PDB formatted file into * a <code>PalmDB</code> object given an <code>InputStream</code>. - * This class is only used by the <code>PalmDB</code> object.</p> + * This class is only used by the <code>PalmDB</code> object. * - * <p>Sample usage:</p> + * <p>Sample usage: * * <blockquote><pre><code> * PdbDecoder decoder = new PdbDecoder("sample.pdb"); * PalmDB palmDB = decoder.parse(); * </code></pre></blockquote> * - * <p>This decoder has the following assumptions on the PDB file:</p> + * <p>This decoder has the following assumptions on the PDB file: * * <p><ol> * <li>There is only one RecordList section in the PDB.</li> @@ -50,9 +50,9 @@ import java.io.DataInputStream; * <li>The raw <code>Record</code> in the <code>Record</code> section * are sorted as well in order, i.e. first <code>Record</code> * comes ahead of second <code>Record</code>, etc.</li> - * </ol></p> + * </ol> * - * <p>Other decoders assume these as well.</p> + * <p>Other decoders assume these as well. * * @author Herbie Ong * @see PalmDB Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbEncoder.java Mon Oct 8 06:19:32 2018 @@ -109,7 +109,7 @@ public final class PdbEncoder { * top of the PDB.</li> * <li>1 byte of <code>Record</code> attribute.</li> * <li>3 bytes unique <code>Record</code> ID.</li> - * </ul></p> + * </ul> * * <p>There should be a total of <code>header.numRecords</code> * of <code>Record</code> index info</p>. Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java Mon Oct 8 06:19:32 2018 @@ -134,7 +134,7 @@ public final class Record { * <code>Record</code> length followed by the data in this * <code>Record</code> object. * - * @param out The <code>OutputStream</code> to write the object. + * @param outs The <code>OutputStream</code> to write the object. * * @throws IOException If any I/O error occurs. */ @@ -151,7 +151,7 @@ public final class Record { * Read the necessary data to create a PDB from * the <code>InputStream</code>. * - * @param in The <code>InputStream</code> to read data from + * @param ins The <code>InputStream</code> to read data from * in order to restore the <code>object</code>. * * @throws IOException If any I/O error occurs. Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java Mon Oct 8 06:19:32 2018 @@ -134,7 +134,7 @@ public class EmbeddedXMLObject extends E /** * Sets the settings data for the embedded object. * - * @param styles DOM representation of the object's styles. + * @param settings DOM representation of the object's styles. */ public void setSettingsDOM(Document settings) { settingsDOM = settings; Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java Mon Oct 8 06:19:32 2018 @@ -1119,7 +1119,7 @@ public abstract class OfficeDocument /** - * <p>Hacked code to filter <!DOCTYPE> tag before + * <p>Hacked code to filter <!DOCTYPE> tag before * sending stream to parser.</p> * * <p>This hacked code needs to be changed later on.</p> @@ -1128,7 +1128,7 @@ public abstract class OfficeDocument * to turn off processing of dtds. Current set of dtds * have bugs, processing them will throw exceptions.</p> * - * <p>This is a simple hack that assumes the whole <!DOCTYPE> + * <p>This is a simple hack that assumes the whole <!DOCTYPE> * tag are all in the same line. This is sufficient for * current StarOffice 6.0 generated XML files. Since this * hack really needs to go away, I don't want to spend @@ -1138,7 +1138,7 @@ public abstract class OfficeDocument * * @param is <code>InputStream</code> to be filtered. * - * @return Reader value without the <!DOCTYPE> tag. + * @return Reader value without the <!DOCTYPE> tag. * * @throws IOException If any I/O error occurs. */ Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java Mon Oct 8 06:19:32 2018 @@ -123,26 +123,21 @@ class alignment extends conversionAlgori /** * <p>This class represents a paragraph <code>Style</code>.</p> * - * <p><table border="1" cellpadding="1"><tr><td> - * Attribute </td><td>Value - * </td></tr><tr><td> - * MARGIN_LEFT </td><td>mm * 100 - * </td></tr><tr><td> - * MARGIN_RIGHT </td><td>mm * 100 - * </td></tr><tr><td> - * MARGIN_TOP </td><td>mm * 100 (space on top of paragraph) - * </td></tr><tr><td> - * MARGIN_BOTTOM </td><td>mm * 100 - * </td></tr><tr><td> - * TEXT_INDENT </td><td>mm * 100 (first line indent) - * </td></tr><tr><td> - * LINE_HEIGHT </td><td>mm * 100, unless or'ed with LH_PCT, in which + * <p><table border="1" cellpadding="1"> + * <caption>Properties</caption> + * <tr><th>Attribute</th><th>Value</th></tr> + * <tr><td>MARGIN_LEFT </td><td>mm * 100</td></tr> + * <tr><td>MARGIN_RIGHT </td><td>mm * 100</td></tr> + * <tr><td>MARGIN_TOP </td><td>mm * 100 (space on top of paragraph)</td></tr> + * <tr><td>MARGIN_BOTTOM </td><td>mm * 100</td></tr> + * <tr><td>TEXT_INDENT </td><td>mm * 100 (first line indent)</td></tr> + * <tr><td>LINE_HEIGHT </td><td>mm * 100, unless or'ed with LH_PCT, in which * case it is a percentage (e.g. 200% for double spacing) * Can also be or'ed with LH_ATLEAST. Value is stored * in bits indicated by LH_VALUEMASK. - * </td></tr><tr><td> - * TEXT_ALIGN </td><td>ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT - * </td></tr></table></p> + * </td></tr> + * <tr><td>TEXT_ALIGN </td><td>ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT</td></tr> + * </table> * * @author David Proulx */ @@ -266,9 +261,9 @@ public class ParaStyle extends Style imp * Constructor for use when going from client device format to DOM. * * @param name Name of the <code>Style</code>. Can be null. - * @param family Family of the <code>Style</code> - usually + * @param familyName Family of the <code>Style</code> - usually * <i>paragraph</i>, <i>text</i>, etc. Can be null. - * @param parent Name of the parent <code>Style</code>, or null + * @param parentName Name of the parent <code>Style</code>, or null * if none. * @param attribs Array of attributes to set. * @param values Array of values to set. @@ -289,13 +284,13 @@ public class ParaStyle extends Style imp * format to DOM. * * @param name Name of the <code>Style</code>. Can be null. - * @param family Family of the <code>Style</code> - usually + * @param familyName Family of the <code>Style</code> - usually * <i>paragraph</i>, <i>text</i>, etc. Can be null. - * @param parent Name of the parent <code>Style</code>, or + * @param parentName Name of the parent <code>Style</code>, or * null if none. * @param attribs Array of attributes indices to set. * @param values Array of values to set. - * @param sc The <code>StyleCatalog</code>, which is used for + * @param lookup The <code>StyleCatalog</code>, which is used for * looking up ancestor <code>Style</code> objects. */ public ParaStyle(String name, String familyName, String parentName, @@ -373,7 +368,7 @@ public class ParaStyle extends Style imp * Set an attribute for this paragraph <code>Style</code>. * * @param attr The attribute index to set. - * @apram value The attribute value to set. + * @param value The attribute value to set. */ public void setAttribute(int attr, String value) { isSet[attr] = true; @@ -496,7 +491,7 @@ public class ParaStyle extends Style imp /** * Create the <code>Node</code> with the specified elements. * - * @parentDoc Parent <code>Document</code> of the + * @param parentDoc <code>Document</code> of the * <code>Node</code> to create. * @param name Name of the <code>Node</code>. * Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java Mon Oct 8 06:19:32 2018 @@ -207,7 +207,7 @@ public class StyleCatalog { /** - * Given a <code>Style</code> <code>s<code> return all + * Given a <code>Style</code> <code>s</code> return all * <code>Style</code> objects that match. * * @param s <code>Style</code> to match. Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java Mon Oct 8 06:19:32 2018 @@ -74,7 +74,7 @@ public class TextStyle extends Style imp /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java Mon Oct 8 06:19:32 2018 @@ -52,8 +52,7 @@ public class BookSettings implements Off /** * Default Constructor for a <code>BookSettings</code> * - * @param dimension if it's a row the height, a column the width - * @param repeated + * @param root */ public BookSettings(Node root) { readNode(root); Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java Mon Oct 8 06:19:32 2018 @@ -46,7 +46,7 @@ public class CellStyle extends Style imp /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java Mon Oct 8 06:19:32 2018 @@ -46,8 +46,7 @@ public class ColumnRowInfo { /** * Constructor for a <code>ColumnRowInfo</code> * - * @param dimension if it's a row the height, a column the width - * @param repeated + * @param type whether Row or column record */ public ColumnRowInfo(int type) { @@ -82,7 +81,7 @@ public class ColumnRowInfo { /** * sets the definition * - * @param newDefinition sets the definition + * @param fmt sets the definition */ public void setFormat(Format fmt) { @@ -110,9 +109,9 @@ public class ColumnRowInfo { } /** - * sets the definition + * Sets the definition * - * @param newDefinition sets the definition + * @param dimension */ public void setSize(int dimension) { @@ -128,11 +127,6 @@ public class ColumnRowInfo { return repeated; } - /** - * Returns the base Cell address - * - * @return the base cell address - */ public void setRepeated(int repeated) { this.repeated = repeated; Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java Mon Oct 8 06:19:32 2018 @@ -44,7 +44,7 @@ public class ColumnStyle extends Style i /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for @@ -97,7 +97,7 @@ public class ColumnStyle extends Style i * <i>text</i>). Can be null. * @param parent Name of parent text <code>Style</code>, or null * for none. - * @param mask the width of this column + * @param colWidth the width of this column * @param sc The <code>StyleCatalog</code>, which is used for * looking up ancestor <code>Style</code> objects. */ @@ -118,7 +118,7 @@ public class ColumnStyle extends Style i /** * Sets the width of this column * - * @return the <code>Format</code> object + * @param colWidth the column width */ public void setColWidth(int colWidth) { Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java Mon Oct 8 06:19:32 2018 @@ -49,7 +49,7 @@ import org.openoffice.xmerge.util.Debug; * Generic small device implementation of <code>DocumentMerger</code> for * the {@link * org.openoffice.xmerge.converter.xml.sxc.SxcPluginFactory - * SxcPluginFactory}. Used with SXC <code>Document</code> objects.</p> + * SxcPluginFactory}. Used with SXC <code>Document</code> objects. */ public class DocumentMergerImpl implements DocumentMerger { Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java Mon Oct 8 06:19:32 2018 @@ -295,7 +295,7 @@ public class Format implements Cloneable /** * Set the font used for this cell. * - * @param fontName The name of the font. + * @param fontSize */ public void setFontSize(int fontSize) { sizeInPoints = fontSize; @@ -312,9 +312,9 @@ public class Format implements Cloneable } /** - * Set the alignmen used for this cell. + * Set the alignment used for this cell. * - * @param fontName The name of the font. + * @param vertAlign */ public void setVertAlign(int vertAlign) { this.vertAlign = vertAlign; @@ -331,9 +331,9 @@ public class Format implements Cloneable } /** - * Set the alignmen used for this cell. + * Set the alignment used for this cell. * - * @param fontName The name of the font. + * @param align */ public void setAlign(int align) { this.align = align; @@ -351,7 +351,7 @@ public class Format implements Cloneable /** * Set the Foreground <code>Color</code> for this cell. * - * @param color A <code>Color</code> object representing the + * @param c A <code>Color</code> object representing the * foreground color. */ public void setForeground(Color c) { @@ -373,7 +373,7 @@ public class Format implements Cloneable /** * Set the Background <code>Color</code> for this cell * - * @param color A <code>Color</code> object representing + * @param c A <code>Color</code> object representing * the background color. */ public void setBackground(Color c) { @@ -433,7 +433,7 @@ public class Format implements Cloneable * than this <code>Style</code>, and nothing it specifies * contradicts this <code>Style</code>. * - * @param style The <code>Style</code> to check. + * @param rhs The <code>Style</code> to check. * * @return true if <code>style</code> is a subset, false * otherwise. Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java Mon Oct 8 06:19:32 2018 @@ -135,7 +135,7 @@ public class NameDefinition implements O /** * Writes out a content.xml entry for this NameDefinition object * - * @param settings a <code>Document</code> object representing the settings.xml + * @param doc a <code>Document</code> object representing the settings.xml * @param root the root xml node to add to */ public void writeNode(org.w3c.dom.Document doc, Node root) { Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java Mon Oct 8 06:19:32 2018 @@ -44,7 +44,7 @@ public class RowStyle extends Style impl /** * Constructor for use when going from DOM to client device format. * - * @param Node The <i>style:style</i> <code>Node</code> containing + * @param node The <i>style:style</i> <code>Node</code> containing * the <code>Style</code>. (This <code>Node</code> is * assumed have a <i>family</i> attribute of <i>text</i>). * @param sc The <code>StyleCatalog</code>, which is used for @@ -97,7 +97,7 @@ public class RowStyle extends Style impl * <i>text</i>). Can be null. * @param parent Name of parent text <code>Style</code>, or null * for none. - * @param mask The height of this row + * @param rowHeight The height of this row * @param sc The <code>StyleCatalog</code>, which is used for * looking up ancestor <code>Style</code> objects. */ @@ -118,9 +118,9 @@ public class RowStyle extends Style impl /** * Sets the height of this row * - * @return the <code>Format</code> object + * @param rowHeight the row height */ - public void setRowHeight(int RowHeight) { + public void setRowHeight(int rowHeight) { this.rowHeight = rowHeight; } Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java Mon Oct 8 06:19:32 2018 @@ -79,8 +79,7 @@ public class SheetSettings implements Of /** * Constructor for a <code>ColumnRowInfo</code> * - * @param dimension if it's a row the height, a column the width - * @param repeated + * @param name */ public SheetSettings(String name) { sheetName = name; @@ -175,12 +174,10 @@ public class SheetSettings implements Of return posLeft; } + /** - * Sets the top row visible in the lower pane and the leftmost column - * visibile in the right pane. + * Gets the top row visible in the lower pane. * - * @param top The top row visible in the lower pane - * @param left The leftmost column visibile in the right pane */ public int getTop() { Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java Mon Oct 8 06:19:32 2018 @@ -104,21 +104,13 @@ public abstract class SpreadsheetEncoder * @param columnWidths An <code>IntArrayList</code> of column * widths. */ - public abstract void setColumnRows(Vector columnRows) throws IOException; + public abstract void setColumnRows(Vector columnWidths) throws IOException; /** - * Set the width of the columns in the WorkBook. - * - * @param columnWidths An <code>IntArrayList</code> of column - * widths. */ public abstract void setNameDefinition(NameDefinition nd) throws IOException; /** - * Set the width of the columns in the WorkBook. - * - * @param columnWidths An <code>IntArrayList</code> of column - * widths. */ public abstract void addSettings(BookSettings s) throws IOException; } Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java Mon Oct 8 06:19:32 2018 @@ -227,7 +227,7 @@ public final class DocumentDeserializerI throw sOE; } catch(Exception e){ - System.out.println("An error occured in the transformation : "+e); + System.out.println("An error occurred in the transformation : "+e); } return baos; } Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java Mon Oct 8 06:19:32 2018 @@ -44,7 +44,7 @@ import org.openoffice.xmerge.util.Debug; * Xslt implementation of <code>DocumentMerger</code> * for the {@link * org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl - * PluginFactoryImpl}.</p> + * PluginFactoryImpl}. */ public class DocumentMergerImpl implements DocumentMerger { Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java Mon Oct 8 06:19:32 2018 @@ -97,7 +97,7 @@ public final class DocumentSerializerImp /** * Method to convert a <code>Document</code> with an xsl stylesheet. * It creates a <code>Document</code> object, which is then transformed - * with the Xslt processer. A <code>ConvertData </code> object is + * with the Xslt processor. A <code>ConvertData </code> object is * constructed and returned. * * @return cd A <code>ConvertData</code> object. @@ -283,7 +283,7 @@ public final class DocumentSerializerImp */ } catch(Exception e){ - System.out.println("An error occured in the transformation : "+e); + System.out.println("An error occurred in the transformation : "+e); } return baos; } Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java Mon Oct 8 06:19:32 2018 @@ -40,15 +40,12 @@ public interface MergeAlgorithm { * This method is to merge the difference to an <code>Iterator</code>. * The original <code>Iterator</code> will be modified after the call. * - * @param objSeq The original sequence which the difference + * @param orgSeq The original sequence which the difference * will be applied. It will be modified. * @param modSeq The modified sequence where the difference * content will be extracted. * @param differences The <code>Difference</code> array. * - * @return An <code>Iterator</code> which is the modified original - * <code>Iterator</code> Sequence. Same as the first parameter. - * * @throws MergeException If an error occurs during the merge. */ public void applyDifference(Iterator orgSeq, Iterator modSeq, Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java Mon Oct 8 06:19:32 2018 @@ -43,6 +43,6 @@ public interface NodeMergeAlgorithm { * @param modifyNode The <code>Node</code> to be merged. It may * be modified. */ - public void merge(Node orginialNode, Node modifyNode); + public void merge(Node originalNode, Node modifyNode); } Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java Mon Oct 8 06:19:32 2018 @@ -54,7 +54,7 @@ import org.openoffice.xmerge.converter.x * If there are more objects in the original sequence than the modified * sequence, then all the extra one in the modified sequence are marked * as delete. - * </li></ol></p> + * </li></ol> * * <p>NOTE: The algorithm will have potential side effect to split rows.</p> * Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java Mon Oct 8 06:19:32 2018 @@ -48,7 +48,7 @@ public final class TextNodeIterator exte /** * Standard constructor. * - * @param initial The initial root <code>Node</code>. + * @param node The initial root <code>Node</code>. */ public TextNodeIterator(Node node) { super(null, node); Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java Mon Oct 8 06:19:32 2018 @@ -45,7 +45,7 @@ public class SheetUtil { * Remove all of the supported attributes. * </li><li> * Remove the first <i>text:p</i> <code>Node</code> for most of the cells. - * </li></ul></p> + * </li></ul> * * @param cc The <code>ConverterCapabilities</code>. * @param node The <code>Node</code>. Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java Mon Oct 8 06:19:32 2018 @@ -108,7 +108,7 @@ public class ColourConverter { * cases where the 16 colour values are something other than there default * values (e.g. in the case of pocket Excel) * - * @param short[] a 16 bit array mapping the 16 colours to there values + * @param lookup a 16 bit array mapping the 16 colours to their values */ public ColourConverter(short lookup[]) { @@ -151,7 +151,7 @@ public class ColourConverter { * This method maps a Pocket Word colour index value to an RGB value as * used by OpenOffice. * - * @param index The index into Pocket Word's colour table. + * @param colour The index into Pocket Word's colour table. * * @return A Color object representing the RGB value of the Pocket Word * colour. @@ -257,7 +257,7 @@ public class ColourConverter { int blue = colour.getBlue(); // We need to convert the pale colors to their base color rather than - // white so we modify the rgb values if the colour is sufficently + // white so we modify the rgb values if the colour is sufficiently // white if(red>0xC0 && green>0xC0 && blue>0xC0) { @@ -307,7 +307,7 @@ public class ColourConverter { * is closest to White. * * Shades of grey will be converted to either Silver or White, where - * Grey may be a more appropraite colour. This is handled specially + * Grey may be a more appropriate colour. This is handled specially * only for Silver and White matches. */ switch (matchedRGB) { Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java Mon Oct 8 06:19:32 2018 @@ -39,7 +39,7 @@ import java.util.Properties; /** * This class is used for logging debug messages. * Currently, there are three types of logging: {@link #INFO}, - * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties + * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties * file to set or unset each type. Also use Debug.properties * to set the writer to either <code>System.out</code>, * <code>System.err</code>, or to a file. @@ -265,7 +265,7 @@ public final class Debug { * <p>This logs the message during runtime if debug.info or debug.trace * in the properties file is set to true.</p> * - * @param int Log type, one of the Debug constants + * @param flag Log type, one of the Debug constants * {@link #INFO}, {@link #TRACE}, {@link #ERROR} * or a combination of which or'ed together. * @param msg The message. @@ -287,7 +287,7 @@ public final class Debug { * of the exception passed in. Refer to the other log method * for description. * - * @param int Log type, one of the Debug constants + * @param flag Log type, one of the Debug constants * {@link #INFO}, {@link #TRACE}, {@link #ERROR} * or a combination of which or'ed together. * @param msg The message. Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java Mon Oct 8 06:19:32 2018 @@ -53,7 +53,7 @@ public final class ConverterInfoMgr { * and must have non-null values for DisplayName, ClassImpl, * OfficeMime, and DeviceMime. * - * @param ConverterInfo A <code>ConverterInfo</code> object + * @param ci A <code>ConverterInfo</code> object * describing a plug-in. * * @throws RegistryException If the <code>ConverterInfo</code> @@ -109,16 +109,16 @@ public final class ConverterInfoMgr { /** - * Adds a <code>Vector</code> of converter plug-ins to the registry. - * Each <code>ConverterInfo</code> in the <code>Vector</code> must have + * Adds an <code>Enumeration</code> of converter plug-ins to the registry. + * Each <code>ConverterInfo</code> in the <code>Enumeration</code> must have * a unique DisplayName and must have non-null values for DisplayName, * ClassImpl, OfficeMime, and DeviceMime. * - * @param ciVectory A <code>Vector</code> of <code>ConverterInfo</code> + * @param jarEnum An <code>Enumeration</code> of <code>ConverterInfo</code> * objects describing one or more plug-in(s). * * @throws RegistryException If a <code>ConverterInfo</code> in the - * <code>Vector</code> is not valid. + * <code>Enumeration</code> is not valid. */ public static void addPlugIn(Enumeration jarEnum) throws RegistryException { @@ -257,8 +257,8 @@ public final class ConverterInfoMgr { * If there are multiple <code>ConverterInfo</code> objects that * support this conversion, only the first is returned. * - * @param deviceMimeFrom The device from mime. - * @param deviceMimeTo The device to mime. + * @param deviceFromMime The device from mime. + * @param deviceToMime The device to mime. * * @return An array of two <code>ConverterInfo</code> objects * that can be chained to perform the specified Modified: openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl?rev=1843109&r1=1843108&r2=1843109&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl (original) +++ openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl Mon Oct 8 06:19:32 2018 @@ -238,7 +238,7 @@ line: while (<STDIN>) { } } # this is the fastest way to check line length, -# but it doesnt work with perl 3.0. +# but it doesn't work with perl 3.0. # if ($line =~ tr/\t/\t/ * 7 + length($line) > 80) { # $pos = $oldp = $p = 0; # while (($p = index($line, "\t", $p)) >= 0) {
