Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java Thu Oct 11 16:53:51 2018 @@ -64,7 +64,7 @@ public class BoundSheet implements BIFFR * Sets the worksheet name. The sheetname length must be doubled as the * String is stored in unicode format. * - * @param sheetName worksheet name + * @param sheetname worksheet name */ void setSheetName(String sheetName) throws IOException { this.cch = (byte) sheetName.length(); @@ -95,7 +95,7 @@ public class BoundSheet implements BIFFR /** * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code> * - * @param output the <code>OutputStream</code> + * @param ouput the <code>OutputStream</code> */ public void write(OutputStream output) throws IOException { @@ -111,7 +111,7 @@ public class BoundSheet implements BIFFR * Reads a BoundSheet from the <code>InputStream</code> The byte array * must be twice the size of the String as it uses unicode. * - * @param input InputStream containing the record data + * @param is InputStream containing the record data */ public int read(InputStream input) throws IOException {
Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java Thu Oct 11 16:53:51 2018 @@ -92,7 +92,7 @@ public abstract class CellValue implemen /** * Writes basic cell value attributes to the specified <code>Outputstream</code> * - * @param output the <code>OutputStream</code> to write to + * @param os the <code>OutputStream</code> to write to */ public void write(OutputStream output) throws IOException { @@ -102,9 +102,9 @@ public abstract class CellValue implemen } /** - * Read a <code>LabelCell</code> from the specified <code>InputStream</code> + * Writes a<code>LabelCell</code> to the specified <code>Outputstream</code> * - * @param input the <code>InputStream</code> to read from + * @param os the <code>OutputStream</code> to write to */ public int read(InputStream input) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java Thu Oct 11 16:53:51 2018 @@ -50,8 +50,8 @@ public class ColInfo implements BIFFReco * * @param colFirst the first column this formatting applies to * @param colLast last column this formatting applies to - * @param colDX column width - * @param ixfe options flags + * @param coldx column width + * @param grbit options flags */ public ColInfo(int colFirst, int colLast, int colDX, int ixfe) { this.colFirst = EndianConverter.writeShort((short)colFirst); @@ -135,7 +135,7 @@ public class ColInfo implements BIFFReco /** * Writes a ColInfo to the specified <code>Outputstream</code> * - * @param output the <code>OutputStream</code> to write to + * @param os the <code>OutputStream</code> to write to */ public void write(OutputStream output) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java Thu Oct 11 16:53:51 2018 @@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Endian import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; /** - * Represents a BIFF record defining the default column width + * Represents a BIFF record defiuning the defualt column width */ public class DefColWidth implements BIFFRecord { @@ -40,18 +40,18 @@ public class DefColWidth implements BIFF private byte[] coldx = new byte[2]; private byte[] ixfe = new byte[2]; +/** + * Constructs a pocket Excel Document from the + * <code>InputStream</code> and assigns it the document name passed in + * + * @param is InputStream containing a Pocket Excel Data file. + */ public DefColWidth() { grbit = new byte[] {0x00, 0x00}; coldx = new byte[] {0x00, 0x09}; ixfe = new byte[] {0x00, 0x00}; } - /** - * Constructs a pocket Excel Document from the - * <code>InputStream</code> and assigns it the document name passed in - * - * @param is InputStream containing a Pocket Excel Data file. - */ public DefColWidth(InputStream is) throws IOException { read(is); } Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java Thu Oct 11 16:53:51 2018 @@ -39,6 +39,12 @@ public class DefRowHeight implements BIF private byte[] unknown1 = new byte[2]; private byte[] unknown2 = new byte[2]; + /** + * Constructs a pocket Excel Document from the + * <code>InputStream</code> and assigns it the document name passed in + * + * @param is InputStream containing a Pocket Excel Data file. + */ public DefRowHeight() { unknown1 = new byte[] {(byte)0x00, (byte)0x00}; unknown2 = new byte[] {(byte)0xFF, (byte)0x00}; Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java Thu Oct 11 16:53:51 2018 @@ -50,6 +50,11 @@ public class DefinedName implements BIFF private String definition = new String(""); private Workbook wb; + /** + * Constructs a Defined Name from the <code>InputStream</code> + * + * @param is InputStream containing the record data + */ public DefinedName(NameDefinition nd, Workbook wb) throws IOException { fh.setWorkbook(wb); @@ -90,7 +95,7 @@ public class DefinedName implements BIFF * Reads a Defined Name from the <code>InputStream</code> The byte array * must be twice the size of the String as it uses unicode. * - * @param input InputStream containing the record data + * @param is InputStream containing the record data */ public int read(InputStream input) throws IOException { @@ -121,7 +126,7 @@ public class DefinedName implements BIFF /** * Write this particular <code>BIFFRecord</code> to the <code>OutputStream</code> * - * @param output the <code>OutputStream</code> + * @param ouput the <code>OutputStream</code> */ public void write(OutputStream output) throws IOException { @@ -187,7 +192,7 @@ public class DefinedName implements BIFF * @return the <code>String</code> containing the definition */ private String getDefinition() { - // pexcel sometimes creates Name definition with no definition, bug?? + // pexcel sometimes creates Name definition with no defintion, bug?? if(EndianConverter.readShort(cce)!=0) { definition = fh.convertPXLToCalc(rgce); definition = definition.substring(1); // remove the '=' @@ -197,7 +202,7 @@ public class DefinedName implements BIFF } /** - * Returns the definition + * Returns the defintion * * @return the <code>String</code> containing the definition */ @@ -206,7 +211,7 @@ public class DefinedName implements BIFF return fh.isRangeType(); } /** - * Returns the definition + * Returns the defintion * * @return the <code>String</code> containing the definition */ Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java Thu Oct 11 16:53:51 2018 @@ -276,7 +276,7 @@ org.openoffice.xmerge.converter.xml.Offi /** * Compare two ExtendedFormat to see if the font index is the same * - * @param rhs the ExtendedFormat to be used in the comaprison + * @param the ExtendedFormat to be used in the comaprison * @return boolean if the two are the same otherwise false */ public boolean compareTo(ExtendedFormat rhs) { @@ -352,7 +352,7 @@ org.openoffice.xmerge.converter.xml.Offi } /** - * Writes the ExtendedFormat to the <code>Outputstream</code> + * Writes the ExtendedFormat to the <code>Outputstream<code> * * @param output the <code>Outputstream</code>to write to */ Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java Thu Oct 11 16:53:51 2018 @@ -52,7 +52,7 @@ public class FloatNumber extends CellVal * Constructs a <code>FloatNumber</code> using specified attributes * * @param row row number - * @param column column number + * @param col column number * @param cellContents contents of the cell * @param ixfe font index */ Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java Thu Oct 11 16:53:51 2018 @@ -56,6 +56,13 @@ public class FontDescription implements public static final int UNDERLINE = 0x01; public static final int ITALIC = 0x02; + /** + * Constructs a FontDescription from the bold italic and undelrine attributes + * + * @param italic Italic attribute + * @param bold Bold attribute + * @param underline Underline attribute + */ public FontDescription(Format fmt) throws IOException { Debug.log(Debug.TRACE,"Building FontDescriptor based on Format : " + fmt); @@ -223,7 +230,7 @@ public class FontDescription implements /** * Constructs a Font Description from the <code>InputStream</code> * - * @param input InputStream containing a <code>FontDescription</code> + * @param is InputStream containing a <code>FontDescription</code> */ public int read(InputStream input) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java Thu Oct 11 16:53:51 2018 @@ -51,9 +51,10 @@ public class Formula extends CellValue i * Constructs a <code>Formula</code> using specified attributes * * @param row row number - * @param column column number + * @param col column number * @param cellContents contents of the cell * @param ixfe font index + * @param value the value of the cell */ public Formula(int row, int column, String cellContents, int ixfe, Format fmt, Workbook wb) throws Exception { @@ -111,7 +112,7 @@ public class Formula extends CellValue i * Translates a <code>String</code> written in infix which represents a * formula into a byte[] what can be written to pocket excel file. * - * @param inFormula formula string + * @param formula string */ public void setFormula(String inFormula) throws Exception { @@ -170,7 +171,7 @@ public class Formula extends CellValue i /** * Writes the Formula record to the <code>OutputStream</code> * - * @param output the <code>OutputStream</code> being written to + * @param the <code>OutputStream</code> being written to */ public void write(OutputStream output) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java Thu Oct 11 16:53:51 2018 @@ -44,7 +44,7 @@ public class LabelCell extends CellValue * Constructs a <code>LabelCell</code> using specified attributes * * @param row row number - * @param column column number + * @param col column number * @param cellContents contents of the cell * @param ixfe font index */ @@ -69,7 +69,7 @@ public class LabelCell extends CellValue /** * Writes a <code>LabelCell</code> to the specified <code>Outputstream</code> * - * @param output the <code>OutputStream</code> to write to + * @param os the <code>OutputStream</code> to write to */ public void write(OutputStream output) throws IOException { @@ -126,7 +126,7 @@ public class LabelCell extends CellValue /** * Sets the <code>String</code> representing the cells contents * - * @param cellContents the <code>String</code> representing the cells contents + * @return the <code>String</code> representing the cells contents */ private void setLabel(String cellContents) throws IOException { rgch = cellContents.getBytes("UTF-16LE"); Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java Thu Oct 11 16:53:51 2018 @@ -120,11 +120,9 @@ public class Pane implements BIFFRecord } /** - * Set the pane number of the active pane - * 0 - bottom right, 1 - top right - * 2 - bottom left, 3 - top left + * Get the hex code for this particular <code>BIFFRecord</code> * - * @param paneNumber the pane number of the active pane + * @return the hex code for <code>Pane</code> */ public void setPaneNumber(int paneNumber) { pnnAcct = (byte) paneNumber; Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java Thu Oct 11 16:53:51 2018 @@ -101,7 +101,7 @@ public class Row implements BIFFRecord { /** * Reads a Row from an <code>InputStream</code> * - * @param input InputStream containing a Pane Record + * @param is InputStream containing a Pane Record */ public int read(InputStream input) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java Thu Oct 11 16:53:51 2018 @@ -76,11 +76,21 @@ public class Selection implements BIFFRe return PocketExcelConstants.CURRENT_SELECTION; } + /** + * Get the hex code for this particular <code>BIFFRecord</code> + * + * @return the hex code for <code>Selection</code> + */ public Point getActiveCell() { Point p = new Point(colActive, EndianConverter.readShort(rwActive)); return p; } + /** + * Get the hex code for this particular <code>BIFFRecord</code> + * + * @return the hex code for <code>Selection</code> + */ public void setActiveCell(Point p) { colActive = (byte) p.getX(); @@ -90,7 +100,7 @@ public class Selection implements BIFFRe /** * Reads a Selection Record from the <code>InputStream</code> * - * @param input InputStream containing a Pocket Excel Data file. + * @param is InputStream containing a Pocket Excel Data file. */ public int read(InputStream input) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java Thu Oct 11 16:53:51 2018 @@ -43,9 +43,9 @@ public class StringValue implements BIFF private byte[] rgch; /** - * Constructs a StringValue Record from a <code>String</code> + * Constructs a StringValue Record from an <code>InputStream</code> * - * @param str + * @param is InputStream containing a StringValue Record */ public StringValue(String str) throws IOException { cch = EndianConverter.writeShort((short) str.length()); @@ -74,7 +74,7 @@ public class StringValue implements BIFF /** * Reads a StringVlaue Record from an <code>InputStream</code> * - * @param input InputStream containing a StringValue Record + * @param is InputStream containing a StringValue Record */ public int read(InputStream input) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java Thu Oct 11 16:53:51 2018 @@ -87,7 +87,7 @@ public class Window1 implements BIFFReco /** * Reads a Window1 Record from an <code>InputStream</code> * - * @param input InputStream containing a Window1 Record + * @param is InputStream containing a Window1 Record */ public int read(InputStream input) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java Thu Oct 11 16:53:51 2018 @@ -123,7 +123,7 @@ public class Window2 implements BIFFReco /** * Reads a Window2 Record from an <code>InputStream</code> * - * @param input InputStream containing a Window2 Record + * @param is InputStream containing a Window2 Record */ public int read(InputStream input) throws IOException { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java Thu Oct 11 16:53:51 2018 @@ -208,7 +208,7 @@ OfficeConstants { } /** - * Adds a font record to the workbook + * Adds a font recrod to the workbook * * @param f the font record to add */ @@ -236,7 +236,7 @@ OfficeConstants { /** * Adds a ExtendedFormat record to the workbook * - * @param fmt the font record to add + * @param f the font recrod to add */ public int addExtendedFormat(Format fmt) throws IOException { @@ -358,7 +358,7 @@ OfficeConstants { /** * Adds a <code>Worksheet</code> to the workbook. * - * @param name the name of the <code>Worksheet</code> to be added + * @return name the name of the <code>Worksheet</code> to be added */ public void addWorksheet(String name) throws IOException { @@ -372,6 +372,7 @@ OfficeConstants { /** * Adds a cell to the current worksheet. * + * @return the name of the <code>Worksheet</code> to be added */ public void addCell(int row,int col, Format fmt, String cellContents) throws IOException { @@ -465,6 +466,12 @@ OfficeConstants { } } + /** + * Will create a number of ColInfo recrods based on the column widths + * based in. + * + * @param an integer list representing the column widths + */ public void addNameDefinition(NameDefinition nameDefinition) throws IOException { DefinedName dn = new DefinedName(nameDefinition, this); Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java Thu Oct 11 16:53:51 2018 @@ -56,18 +56,25 @@ public class Worksheet { private BeginningOfFile bof; private Eof eof; + /** + * Writes the current workbook to the <code>Outputstream</code> + * + * @param os The destination outputstream + */ public Worksheet(Workbook wb) { this.wb = wb; } /** * Default Contructor + * + * @param os The destination outputstream */ public Worksheet() { } /** - * Writes the current workbook to the <code>OutputStream</code> + * Writes the current workbook to the <code>Outputstream</code> * * @param os The destination outputstream */ @@ -222,7 +229,7 @@ public class Worksheet { * Adds a cell to this worksheet. Current valdid celltypes are * <code>FloatNumber</code>, <code>LabelCell</code> or <code>Formula</code> * - * @param br + * @param f the font recrod to add */ public void addCell(BIFFRecord br) { cells.add(br); @@ -232,7 +239,7 @@ public class Worksheet { * Adds a number of ColInfo Records to the worksheet base on a list of * clumnwidths passed in * - * @param r list of column widths + * @param list of column widths */ public void addRow(Row r) { rows.add(r); @@ -242,12 +249,16 @@ public class Worksheet { * Adds a number of ColInfo Records to the worksheet base on a list of * clumnwidths passed in * - * @param c list of column widths + * @param list of column widths */ public void addCol(ColInfo c) { colInfo.add(c); } - + /** + * Returns an <code>Enumeration</code> to the ColInfo's for this worksheet + * + * @return an <code>Enumeration</code> to the ColInfo's + */ public void addSettings(SheetSettings s) { sel.setActiveCell(s.getCursor()); Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java Thu Oct 11 16:53:51 2018 @@ -45,7 +45,7 @@ import org.openoffice.xmerge.util.Debug; * else if token is close bracket * pop from stack into result until close bracket or function * else - * while stack.top.priority >= token.priority + * while stack.top.priority >= token.priority * add stack.pop to result * push token onto stack * </pre> Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java Thu Oct 11 16:53:51 2018 @@ -33,7 +33,7 @@ import org.openoffice.xmerge.converter.x /** * This Helper class provides a simplified interface to conversion between PocketXL formula representation * and Calc formula representation.<p> - * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula} + * The class is used by {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula} */ public class FormulaHelper { Modified: openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java?rev=1843571&r1=1843570&r2=1843571&view=diff ============================================================================== --- openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java (original) +++ openoffice/branches/AOO416/main/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java Thu Oct 11 16:53:51 2018 @@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Debug; /** * This is the Formula Parser based on an article written by Jack Crenshaw. It is a * top down parser with some basic error handling. It handles - * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as functions. + * +,-,*,/,>,<,>=,<=,=,<>, unary + and - as well as functions. * The BNF notation for this parser is * <pre> * <expression> ::= <unary op> <term> [<addop>|<logop> <term>] @@ -110,7 +110,7 @@ public class FormulaParser { } /** - * Identify <, >, <=, >=, =, <> using the index to find the current character(s) + * Identify <, >, <=, >=, =, <> using the index to find the current character(s) * * @return A boolean returning the result of the comparison */ @@ -131,9 +131,9 @@ public class FormulaParser { } /** - * Identify <, >, <=, >=, =, <> + * Identify <, >, <=, >=, =, <> * - * @param op The <code>String</code> which is to be identified + * @param The <code>String</code> which is to be identified * @return A boolean returning the result of the comparison */ private boolean isLogicalOp(String op) { @@ -397,7 +397,7 @@ public class FormulaParser { * Will keep pulling valid logical operators from the formula and return * the resultant <code>String</code>. * - * @return a <code>String</code> representing a logical operator + * @return a <code>String<code> representing a logical operator */ private String getLogicalOperator() throws FormulaParsingException { String op = new String(); @@ -535,7 +535,7 @@ public class FormulaParser { /** * Pull a logical operator starting at the current index, add a token for - * that operator to the tokenVector and call <code>term</code> to parse the + * that operator to the tokenVector and call <code>term<code> to parse the * right hand side of the operator */ private void logicalOp() throws FormulaParsingException { 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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#infix2RPN from infix to RPN.}. + * {@link org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 function names. + * Symbols will generally be either operators (_, -, *, etc) or funtion 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 id The value to be associated with a given symbol + * @param value 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -284,7 +284,7 @@ public class TokenEncoder { /** * A Cell Reference Encoder (It supports absolute and relative addressing) * - * @param cellCoordinates + * @param t <code>Token</code> to be encoded * @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 s + * @param t <code>Token</code> to be encoded * @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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -130,7 +130,7 @@ class DocumentDescriptor { /* - * This method loads the initial fixed portion of the descriptor and the + * This method loads the intial 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -69,7 +69,7 @@ public final class DocumentDeserializerI /** - * <p>Initialises a new <code>DocumentDeserializerImpl</code> using the + * 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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}. + * PluginFactoryImpl}.</p> */ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 doc The <code>Document</code> to convert. + * @param document 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -90,11 +90,11 @@ public final class PluginFactoryImpl ext /** - * <p>The <code>DocumentDeserializer</code> is used to convert + * 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> * - * <p>The <code>ConvertData</code> object is passed along to the + * 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 docData InputStream containing a Pocket Word data file. + * @param is 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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. + * "Office" <code>Document</code> format.</p> * * <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. + * <code>ConvertData</code> object is passed in to be used as input.</p> * * @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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -38,11 +38,11 @@ package org.openoffice.xmerge; public interface DocumentDeserializerFactory { /** - * <p>The <code>DocumentDeserializer</code> is used to convert + * The <code>DocumentDeserializer</code> is used to convert * from the "Device" <code>Document</code> format to * the "Office" <code>Document</code> format.</p> * - * <p>The <code>ConvertData</code> object is passed along to the + * 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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. * - * @param newDom DOM <code>Document</code> object. + * @return 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -116,7 +116,7 @@ public class PalmDocument /** * Writes the <code>PalmDocument</code> to an <code>OutputStream</code>. * - * @param os The <code>OutputStream</code> to write the content. + * @param is 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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. + * This class is only used by the <code>PalmDB</code> object.</p> * - * <p>Sample usage: + * <p>Sample usage:</p> * * <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>This decoder has the following assumptions on the PDB file:</p> * * <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> + * </ol></p> * - * <p>Other decoders assume these as well. + * <p>Other decoders assume these as well.</p> * * @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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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> + * </ul></p> * * <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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -134,7 +134,7 @@ public final class Record { * <code>Record</code> length followed by the data in this * <code>Record</code> object. * - * @param outs The <code>OutputStream</code> to write the object. + * @param out 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 ins The <code>InputStream</code> to read data from + * @param in 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -134,7 +134,7 @@ public class EmbeddedXMLObject extends E /** * Sets the settings data for the embedded object. * - * @param settings DOM representation of the object's styles. + * @param styles 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -123,21 +123,26 @@ class alignment extends conversionAlgori /** * <p>This class represents a paragraph <code>Style</code>.</p> * - * <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 + * <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 * 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> + * </td></tr><tr><td> + * TEXT_ALIGN </td><td>ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT + * </td></tr></table></p> * * @author David Proulx */ @@ -261,9 +266,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 familyName Family of the <code>Style</code> - usually + * @param family Family of the <code>Style</code> - usually * <i>paragraph</i>, <i>text</i>, etc. Can be null. - * @param parentName Name of the parent <code>Style</code>, or null + * @param parent 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. @@ -284,13 +289,13 @@ public class ParaStyle extends Style imp * format to DOM. * * @param name Name of the <code>Style</code>. Can be null. - * @param familyName Family of the <code>Style</code> - usually + * @param family Family of the <code>Style</code> - usually * <i>paragraph</i>, <i>text</i>, etc. Can be null. - * @param parentName Name of the parent <code>Style</code>, or + * @param parent 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 lookup The <code>StyleCatalog</code>, which is used for + * @param sc The <code>StyleCatalog</code>, which is used for * looking up ancestor <code>Style</code> objects. */ public ParaStyle(String name, String familyName, String parentName, @@ -368,7 +373,7 @@ public class ParaStyle extends Style imp * Set an attribute for this paragraph <code>Style</code>. * * @param attr The attribute index to set. - * @param value The attribute value to set. + * @apram value The attribute value to set. */ public void setAttribute(int attr, String value) { isSet[attr] = true; @@ -491,7 +496,7 @@ public class ParaStyle extends Style imp /** * Create the <code>Node</code> with the specified elements. * - * @param parentDoc <code>Document</code> of the + * @parentDoc Parent <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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -52,7 +52,8 @@ public class BookSettings implements Off /** * Default Constructor for a <code>BookSettings</code> * - * @param root + * @param dimension if it's a row the height, a column the width + * @param repeated */ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -46,7 +46,8 @@ public class ColumnRowInfo { /** * Constructor for a <code>ColumnRowInfo</code> * - * @param type whether Row or column record + * @param dimension if it's a row the height, a column the width + * @param repeated */ public ColumnRowInfo(int type) { @@ -81,7 +82,7 @@ public class ColumnRowInfo { /** * sets the definition * - * @param fmt sets the definition + * @param newDefinition sets the definition */ public void setFormat(Format fmt) { @@ -109,9 +110,9 @@ public class ColumnRowInfo { } /** - * Sets the definition + * sets the definition * - * @param dimension + * @param newDefinition sets the definition */ public void setSize(int dimension) { @@ -127,6 +128,11 @@ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 colWidth the width of this column + * @param mask 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 * - * @param colWidth the column width + * @return the <code>Format</code> object */ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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. + * SxcPluginFactory}. Used with SXC <code>Document</code> objects.</p> */ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -295,7 +295,7 @@ public class Format implements Cloneable /** * Set the font used for this cell. * - * @param fontSize + * @param fontName The name of the font. */ public void setFontSize(int fontSize) { sizeInPoints = fontSize; @@ -312,9 +312,9 @@ public class Format implements Cloneable } /** - * Set the alignment used for this cell. + * Set the alignmen used for this cell. * - * @param vertAlign + * @param fontName The name of the font. */ public void setVertAlign(int vertAlign) { this.vertAlign = vertAlign; @@ -331,9 +331,9 @@ public class Format implements Cloneable } /** - * Set the alignment used for this cell. + * Set the alignmen used for this cell. * - * @param align + * @param fontName The name of the font. */ 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 c A <code>Color</code> object representing the + * @param color 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 c A <code>Color</code> object representing + * @param color 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 rhs The <code>Style</code> to check. + * @param style 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -135,7 +135,7 @@ public class NameDefinition implements O /** * Writes out a content.xml entry for this NameDefinition object * - * @param doc a <code>Document</code> object representing the settings.xml + * @param settings 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 rowHeight The height of this row + * @param mask 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 * - * @param rowHeight the row height + * @return the <code>Format</code> object */ - 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -79,7 +79,8 @@ public class SheetSettings implements Of /** * Constructor for a <code>ColumnRowInfo</code> * - * @param name + * @param dimension if it's a row the height, a column the width + * @param repeated */ public SheetSettings(String name) { sheetName = name; @@ -174,10 +175,12 @@ public class SheetSettings implements Of return posLeft; } - /** - * Gets the top row visible in the lower pane. + * Sets the top row visible in the lower pane and the leftmost column + * visibile in the right 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -104,13 +104,21 @@ public abstract class SpreadsheetEncoder * @param columnWidths An <code>IntArrayList</code> of column * widths. */ - public abstract void setColumnRows(Vector columnWidths) throws IOException; + public abstract void setColumnRows(Vector columnRows) 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -227,7 +227,7 @@ public final class DocumentDeserializerI throw sOE; } catch(Exception e){ - System.out.println("An error occurred in the transformation : "+e); + System.out.println("An error occured 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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}. + * PluginFactoryImpl}.</p> */ 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 processor. A <code>ConvertData </code> object is + * with the Xslt processer. 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 occurred in the transformation : "+e); + System.out.println("An error occured 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 2018 @@ -40,12 +40,15 @@ 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 orgSeq The original sequence which the difference + * @param objSeq 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=1843571&r1=1843570&r2=1843571&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 Thu Oct 11 16:53:51 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 originalNode, Node modifyNode); + public void merge(Node orginialNode, Node modifyNode); }
