From owner-svn-ports-all@freebsd.org Sun Oct 18 08:20:08 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C37F6A18E6C; Sun, 18 Oct 2015 08:20:08 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 681E98DE; Sun, 18 Oct 2015 08:20:08 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I8K7Jm080971; Sun, 18 Oct 2015 08:20:07 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I8K7FH080969; Sun, 18 Oct 2015 08:20:07 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201510180820.t9I8K7FH080969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sun, 18 Oct 2015 08:20:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399606 - in head/editors/openoffice-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 08:20:08 -0000 Author: truckman Date: Sun Oct 18 08:20:07 2015 New Revision: 399606 URL: https://svnweb.freebsd.org/changeset/ports/399606 Log: Patch the source with r1697228, r1697237, r1697247, r1697306, and r1697312 from upstream trunk (with a few tweaks to compensate for some other upstream changes not included here) to unbreak the build with OpenJDK8. Revert r399537 to unmark broken. PR: 199591 (openjdk8 by default exp-run) Added: head/editors/openoffice-devel/files/patch-openjdk8 (contents, props changed) Modified: head/editors/openoffice-devel/Makefile Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Sun Oct 18 08:18:26 2015 (r399605) +++ head/editors/openoffice-devel/Makefile Sun Oct 18 08:20:07 2015 (r399606) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -170,10 +170,6 @@ MMEDIA_USE= GSTREAMER=yes .include -.if ${JAVA_PORT_VERSION:M1.8.*} -BROKEN= Does not build with JDK 1.8 -.endif - .include <${FILESDIR}/Makefile.localized> .if ${COMPILER_TYPE} == clang Added: head/editors/openoffice-devel/files/patch-openjdk8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-devel/files/patch-openjdk8 Sun Oct 18 08:20:07 2015 (r399606) @@ -0,0 +1,1808 @@ +--- javaunohelper/com/sun/star/comp/helper/Bootstrap.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/comp/helper/Bootstrap.java +@@ -97,6 +97,7 @@ public class Bootstrap { + @param context_entries the hash table contains mappings of entry names (type string) to + context entries (type class ComponentContextEntry). + @return a new context. ++ @throws java.lang.Exception + */ + static public XComponentContext createInitialComponentContext( Hashtable context_entries ) + throws Exception +@@ -148,7 +149,8 @@ public class Bootstrap { + * Bootstraps a servicemanager with the jurt base components registered. + *

+ * @return a freshly boostrapped service manager +- * @see com.sun.star.lang.ServiceManager ++ * @see "com.sun.star.lang.ServiceManager" ++ * @throws java.lang.Exception + */ + static public XMultiServiceFactory createSimpleServiceManager() throws Exception + { +@@ -157,10 +159,12 @@ public class Bootstrap { + } + + +- /** Bootstraps the initial component context from a native UNO installation. +- +- @see cppuhelper/defaultBootstrap_InitialComponentContext() +- */ ++ /** ++ * Bootstraps the initial component context from a native UNO installation. ++ *

++ * @return ++ * @see defaultBootstrap_InitialComponentContext() ++ */ + static public final XComponentContext defaultBootstrap_InitialComponentContext() + throws Exception + { +@@ -173,7 +177,7 @@ public class Bootstrap { + @param bootstrap_parameters + bootstrap parameters (maybe null) + +- @see cppuhelper/defaultBootstrap_InitialComponentContext() ++ @see defaultBootstrap_InitialComponentContext() + */ + static public final XComponentContext defaultBootstrap_InitialComponentContext( + String ini_file, Hashtable bootstrap_parameters ) +--- javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java +@@ -29,7 +29,7 @@ package com.sun.star.comp.helper; + The first one is commonly used for singleton objects of the component + context, that are raised on first-time retrieval of the key. + You have to pass a com.sun.star.lang.XSingleComponentFactory +- or string (=> service name) object for this. ++ or string (=> service name) object for this. +

+ */ + public class ComponentContextEntry +--- javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java +@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKe + * The SharedLibraryLoader class provides the functionality of the com.sun.star.loader.SharedLibrary + * service. + *

+- * @see com.sun.star.loader.SharedLibrary ++ * @see "com.sun.star.loader.SharedLibrary" + * @see com.sun.star.comp.servicemanager.ServiceManager +- * @see com.sun.star.lang.ServiceManager ++ * @see "com.sun.star.lang.ServiceManager" + */ + public class SharedLibraryLoader { + /** +@@ -70,9 +70,9 @@ public class SharedLibraryLoader { + * @return the factory for the "com.sun.star.comp.stoc.DLLComponentLoader" component. + * @param smgr the ServiceManager + * @param regKey the root registry key +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static XSingleServiceFactory getServiceFactory( + XMultiServiceFactory smgr, +@@ -93,9 +93,9 @@ public class SharedLibraryLoader { + * @param impName the implementation name of the component + * @param smgr the ServiceManager + * @param regKey the root registry key +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static XSingleServiceFactory getServiceFactory( + String libName, +@@ -116,9 +116,9 @@ public class SharedLibraryLoader { + * @return true if the registration was successfull - otherwise false + * @param smgr the ServiceManager + * @param regKey the root key under that the component should be registered +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static boolean writeRegistryServiceInfo( + com.sun.star.lang.XMultiServiceFactory smgr, +@@ -136,9 +136,9 @@ public class SharedLibraryLoader { + * @param libName name of the shared library + * @param smgr the ServiceManager + * @param regKey the root key under that the component should be registered +- * @see com.sun.star.loader.SharedLibrary +- * @see com.sun.star.lang.ServiceManager +- * @see com.sun.star.registry.RegistryKey ++ * @see "com.sun.star.loader.SharedLibrary" ++ * @see "com.sun.star.lang.ServiceManager" ++ * @see "com.sun.star.registry.RegistryKey" + */ + public static boolean writeRegistryServiceInfo( + String libName, +--- javaunohelper/com/sun/star/lib/uno/helper/Factory.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/Factory.java +@@ -34,7 +34,8 @@ import com.sun.star.uno.UnoRuntime; + /** Factory helper class supporting com.sun.star.lang.XServiceInfo and + com.sun.star.lang.XSingleComponentFactory. + +- @attention ++ Attention: ++
+ This factory implementation does not support lang.XSingleServiceFactory. + */ + public class Factory +--- javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +@@ -467,6 +467,8 @@ public class InterfaceContainer implemen + /** The iterator keeps a copy of the list. Changes to InterfaceContainer do not + * affect the data of the iterator. Conversly, changes to the iterator are effect + * InterfaceContainer. ++ * ++ * @param index + */ + synchronized public ListIterator listIterator(int index) + { +--- javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +@@ -122,7 +122,7 @@ XMultiPropertySet + * initialization of the inheriting class (i.e. within the contructor) + * @param name The property's name (Property.Name). + * @param handle The property's handle (Property.Handle). +- * @param Type The property's type (Property.Type). ++ * @param type The property's type (Property.Type). + * @param attributes The property's attributes (Property.Attributes). + * @param id Identifies the property's storage. + */ +@@ -140,8 +140,7 @@ XMultiPropertySet + * Registration has to occur during + * initialization of the inheriting class (i.e. within the contructor). + * @param name The property's name (Property.Name). +- * @param handle The property's handle (Property.Handle). +- * @param Type The property's type (Property.Type). ++ * @param type The property's type (Property.Type). + * @param attributes The property's attributes (Property.Attributes). + * @param id Identifies the property's storage. + */ +@@ -563,11 +562,11 @@ XMultiPropertySet + * {@link #setFastPropertyValue XFastPropertySet.setFastPropertyValue} + * and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}. + * If this method fails, that is, it returns false or throws an exception, then no listeners are notified and the +- * property value, that was intended to be changed, remains untouched.
This method does not have to deal with property attributes, such as ++ * property value, that was intended to be changed, remains untouched.
This method does not have to deal with property attributes, such as + * PropertyAttribute.READONLY or PropertyAttribute.MAYBEVOID. The processing of these attributes occurs +- * in the calling methods.
++ * in the calling methods.
+ * Only if this method returns successfully further processing, such +- * as listener notification and finally the modifiction of the property's value, will occur.
++ * as listener notification and finally the modifiction of the property's value, will occur.
+ * + * The actual modification of a property's value is done by {@link #setPropertyValueNoBroadcast setPropertyValueNoBroadcast} + * which is called subsequent to convertPropertyValue. +@@ -593,10 +592,10 @@ XMultiPropertySet + * Then, no conversion is necessary, since they can hold all possible values. However, if + * the member is an Object and setVal is an Any then the object contained in the any is assigned to + * the member. The extra type information which exists as Type object in the Any will get lost. If this is not +- * intended then use an Any variable rather then an Object.
++ * intended then use an Any variable rather then an Object.
+ * If a member is an Object or Any and the argument setVal is an Object, other than String or array, + * then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param newVal +- * returns the XInterface.
++ * returns the XInterface.
+ * If a member is an UNO interface, then setVal is queried for this interface and the result is returned. + * If setVal is null then newVal will be null too after return. + *

+@@ -793,7 +792,7 @@ XMultiPropertySet + * If a property has the READONLY attribute set, and one of the setter methods, such as setPropertyValue, has been + * called, then this method is not going to be called. + * @param property the property for which the new value is set +- * @param value the new value for the property. ++ * @param newVal the new value for the property. + * @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller, + * occured during the setting of the value. + */ +--- javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java.orig 2014-02-25 08:30:16 UTC ++++ javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java +@@ -193,7 +193,7 @@ public final class PropertySetMixin { + @param newValue the property value corresponding to the new + attribute value. This is only used as + com.sun.star.beans.PropertyChangeEvent.NewValue, which is +- rather useless, anyway (see “Using the Observer Pattern&rdquo: in ++ rather useless, anyway (see “Using the Observer Pattern” in + + OpenOffice.org Coding Guidelines), unless the + attribute that is going to be set is constrained. If the attribute +--- ridljar/com/sun/star/uno/IEnvironment.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/IEnvironment.java +@@ -63,7 +63,7 @@ public interface IEnvironment { + * given bridge B2. + *

  • A proxy object, created as a remote object is mapped into this + * environment via a given bridge.
    • +- *

    ++ * + * + *

    The object actually registered may differ from the specified + * object that is passed as an argument. This enables an +--- ridljar/com/sun/star/uno/IMethodDescription.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/IMethodDescription.java +@@ -52,7 +52,7 @@ public interface IMethodDescription exte + boolean isConst(); + + /** +- * Gives any array of ITypeDescription> of ++ * Gives any array of ITypeDescription of + * the [in] parameters. + *

    + * @return the in parameters +@@ -60,7 +60,7 @@ public interface IMethodDescription exte + ITypeDescription[] getInSignature(); + + /** +- * Gives any array of ITypeDescription> of ++ * Gives any array of ITypeDescription of + * the [out] parameters. + *

    + * @return the out parameters +--- ridljar/com/sun/star/uno/ITypeDescription.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/ITypeDescription.java +@@ -103,8 +103,8 @@ public interface ITypeDescription { + /** + * Gets the (UNO) type name. + * +- *

    The following table lists how UNO types map to type names:

    + * ++ * + * + * + * +@@ -119,15 +119,15 @@ public interface ITypeDescription { + * + * + * +- * "hyper" ++ * + * +- * "unsigned hyper" ++ * + * +- * "float" +- * "double" +- * "string" +- * "type" +- * "any" ++ * ++ * ++ * ++ * ++ * + * + * + * +@@ -148,7 +148,7 @@ public interface ITypeDescription { + * + * + * +- * ++ * + *
    The following table lists how UNO types map to type names:
    UNO typetype name
    LONG"long"
    UNSIGNED LONG"unsigned long"
    HYPER
    HYPER"hyper"
    UNSIGNED HYPERUNSIGNED HYPER"unsigned hyper"
    FLOAT
    DOUBLE
    STRING
    TYPE
    ANY
    FLOAT"float"
    DOUBLE"double"
    STRING"string"
    TYPE"type"
    ANY"any"
    sequence type of base type T"[]" followed by type name for Tinterface type named NN (see below)
    + *

    For a UNO type named N, consisting of a sequence of module + * names M1, ..., Mn followed by +--- ridljar/com/sun/star/uno/Type.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/Type.java +@@ -33,7 +33,7 @@ import java.util.HashMap; + * SHORT) do not have a matching Java class. For another, it can be + * necessary to describe a type which is unknown to the Java runtime system + * (for example, for delaying the need of a class, so that it is possible to +- * generate it on the fly.)

    ++ * generate it on the fly.) + * + *

    A Type is uniquely determined by its type class (a + * TypeClass) and its type name (a String); these two +@@ -204,7 +204,7 @@ public class Type { + * + *

    In certain cases, one Java class corresponds to two UNO types (e.g., + * the Java class short[].class corresponds to both a sequence +- * of SHORT and a sequence of UNSIGNED SHORT in ++ * of SHORT and a sequence of UNSIGNED SHORT in + * UNO). In such ambiguous cases, the parameter alternative + * controls which UNO type is chosen:

    + *
      +--- ridljar/com/sun/star/uno/Union.java.orig 2014-02-25 08:33:14 UTC ++++ ridljar/com/sun/star/uno/Union.java +@@ -27,7 +27,7 @@ package com.sun.star.uno; + * The Union class is the base class for all classes generated + * as java binding for the IDL type union. + *

      +- * Note: The idl type union is currently not fully ++ * Note: The idl type union is currently not fully + * integrated into the UNO framework, so don't use it. + * + * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $ +--- xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentMergerImpl.java +@@ -44,7 +44,7 @@ import org.openoffice.xmerge.util.Debug; + * AportisDoc implementation of DocumentMerger + * for the {@link + * org.openoffice.xmerge.converter.xml.sxw.aportisdoc.PluginFactoryImpl +- * PluginFactoryImpl}.

      ++ * PluginFactoryImpl}. + */ + public class DocumentMergerImpl implements DocumentMerger { + +--- xmerge/source/bridge/java/XMergeBridge.java.orig 2014-02-25 08:29:07 UTC ++++ xmerge/source/bridge/java/XMergeBridge.java +@@ -92,7 +92,6 @@ public class XMergeBridge { + + /** This inner class provides the component as a concrete implementation + * of the service description. It implements the needed interfaces. +- * @implements XTypeProvider + */ + static public class _XMergeBridge implements + XImportFilter, +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BeginningOfFile.java +@@ -44,9 +44,6 @@ public class BeginningOfFile implements + + /** + * Constructor that initializes the member values. +- * +- * @param ver Version Number +- * Substream type (workbook = 0x05, worksheet = 0x10) + */ + public BeginningOfFile(boolean global) { + setVersion((short) 271); +@@ -61,6 +58,10 @@ public class BeginningOfFile implements + read(is); + } + ++ /** ++ * ++ * @param version Version Number ++ */ + private void setVersion(short version) { + this.version = EndianConverter.writeShort(version); + } +@@ -79,6 +80,10 @@ public class BeginningOfFile implements + subStream = EndianConverter.writeShort((short) 0x10); + } + ++ /** ++ * ++ * @return Substream type (workbook = 0x05, worksheet = 0x10) ++ */ + int getSubStreamType() { + return EndianConverter.readShort(subStream); + } +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BlankCell.java +@@ -49,8 +49,7 @@ public class BlankCell extends CellValue + * Constructs a BlankCell using specified attributes + * + * @param row row number +- * @param col column number +- * @param cellContents contents of the cell ++ * @param column column number + * @param ixfe font index + */ + public BlankCell(int row, int column, int ixfe) throws IOException { +@@ -83,7 +82,7 @@ public class BlankCell extends CellValue + /** + * Reads a BlankCell InputStream + * +- * @param is InputStream containing a BlankCell. ++ * @param input InputStream containing a BlankCell. + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoolErrCell.java +@@ -43,7 +43,7 @@ public class BoolErrCell extends CellVal + * Constructs a BoolErrCell from arguments + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param ixfe font index + * @param bBoolErr Boolean value or error value + * @param fError Boolean error flag +@@ -78,7 +78,7 @@ public class BoolErrCell extends CellVal + /** + * Writes a BoolErrCell to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -95,7 +95,7 @@ public class BoolErrCell extends CellVal + /** + * Reads a BoolErrCell from the InputStream + * +- * @param is InputStream containing a BoolErrCell ++ * @param input InputStream containing a BoolErrCell + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java +@@ -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 BIFFRecord to the OutputStream + * +- * @param ouput the OutputStream ++ * @param output the OutputStream + */ + public void write(OutputStream output) throws IOException { + +@@ -111,7 +111,7 @@ public class BoundSheet implements BIFFR + * Reads a BoundSheet from the InputStream The byte array + * must be twice the size of the String as it uses unicode. + * +- * @param is InputStream containing the record data ++ * @param input InputStream containing the record data + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/CellValue.java +@@ -92,7 +92,7 @@ public abstract class CellValue implemen + /** + * Writes basic cell value attributes to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -102,9 +102,9 @@ public abstract class CellValue implemen + } + + /** +- * Writes aLabelCell to the specified Outputstream ++ * Read a LabelCell from the specified InputStream + * +- * @param os the OutputStream to write to ++ * @param input the InputStream to read from + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ColInfo.java +@@ -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 grbit options flags ++ * @param colDX column width ++ * @param ixfe 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 Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefColWidth.java +@@ -32,7 +32,7 @@ import org.openoffice.xmerge.util.Endian + import org.openoffice.xmerge.converter.xml.sxc.pexcel.PocketExcelConstants; + + /** +- * Represents a BIFF record defiuning the defualt column width ++ * Represents a BIFF record defining the default 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 +- * InputStream 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 ++ * InputStream 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); + } +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefRowHeight.java +@@ -39,12 +39,6 @@ public class DefRowHeight implements BIF + private byte[] unknown1 = new byte[2]; + private byte[] unknown2 = new byte[2]; + +- /** +- * Constructs a pocket Excel Document from the +- * InputStream 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}; +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/DefinedName.java +@@ -50,11 +50,6 @@ public class DefinedName implements BIFF + private String definition = new String(""); + private Workbook wb; + +- /** +- * Constructs a Defined Name from the InputStream +- * +- * @param is InputStream containing the record data +- */ + public DefinedName(NameDefinition nd, Workbook wb) throws IOException { + + fh.setWorkbook(wb); +@@ -95,7 +90,7 @@ public class DefinedName implements BIFF + * Reads a Defined Name from the InputStream The byte array + * must be twice the size of the String as it uses unicode. + * +- * @param is InputStream containing the record data ++ * @param input InputStream containing the record data + */ + public int read(InputStream input) throws IOException { + +@@ -126,7 +121,7 @@ public class DefinedName implements BIFF + /** + * Write this particular BIFFRecord to the OutputStream + * +- * @param ouput the OutputStream ++ * @param output the OutputStream + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java +@@ -276,7 +276,7 @@ org.openoffice.xmerge.converter.xml.Offi + /** + * Compare two ExtendedFormat to see if the font index is the same + * +- * @param the ExtendedFormat to be used in the comaprison ++ * @param rhs 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 Outputstream ++ * Writes the ExtendedFormat to the Outputstream + * + * @param output the Outputstreamto write to + */ +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FloatNumber.java +@@ -52,7 +52,7 @@ public class FloatNumber extends CellVal + * Constructs a FloatNumber using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index + */ +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java +@@ -56,13 +56,6 @@ 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); +@@ -230,7 +223,7 @@ public class FontDescription implements + /** + * Constructs a Font Description from the InputStream + * +- * @param is InputStream containing a FontDescription ++ * @param input InputStream containing a FontDescription + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Formula.java +@@ -51,10 +51,9 @@ public class Formula extends CellValue i + * Constructs a Formula using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column 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 { +@@ -112,7 +111,7 @@ public class Formula extends CellValue i + * Translates a String written in infix which represents a + * formula into a byte[] what can be written to pocket excel file. + * +- * @param formula string ++ * @param inFormula formula string + */ + public void setFormula(String inFormula) throws Exception { + +@@ -171,7 +170,7 @@ public class Formula extends CellValue i + /** + * Writes the Formula record to the OutputStream + * +- * @param the OutputStream being written to ++ * @param output the OutputStream being written to + */ + public void write(OutputStream output) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java +@@ -44,7 +44,7 @@ public class LabelCell extends CellValue + * Constructs a LabelCell using specified attributes + * + * @param row row number +- * @param col column number ++ * @param column column number + * @param cellContents contents of the cell + * @param ixfe font index + */ +@@ -69,7 +69,7 @@ public class LabelCell extends CellValue + /** + * Writes a LabelCell to the specified Outputstream + * +- * @param os the OutputStream to write to ++ * @param output the OutputStream to write to + */ + public void write(OutputStream output) throws IOException { + +@@ -126,7 +126,7 @@ public class LabelCell extends CellValue + /** + * Sets the String representing the cells contents + * +- * @return the String representing the cells contents ++ * @param cellContents the String representing the cells contents + */ + private void setLabel(String cellContents) throws IOException { + rgch = cellContents.getBytes("UTF-16LE"); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java +@@ -120,9 +120,11 @@ public class Pane implements BIFFRecord + } + + /** +- * Get the hex code for this particular BIFFRecord ++ * Set the pane number of the active pane ++ * 0 - bottom right, 1 - top right ++ * 2 - bottom left, 3 - top left + * +- * @return the hex code for Pane ++ * @param paneNumber the pane number of the active pane + */ + public void setPaneNumber(int paneNumber) { + pnnAcct = (byte) paneNumber; +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Row.java +@@ -101,7 +101,7 @@ public class Row implements BIFFRecord { + /** + * Reads a Row from an InputStream + * +- * @param is InputStream containing a Pane Record ++ * @param input InputStream containing a Pane Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java +@@ -76,21 +76,11 @@ public class Selection implements BIFFRe + return PocketExcelConstants.CURRENT_SELECTION; + } + +- /** +- * Get the hex code for this particular BIFFRecord +- * +- * @return the hex code for Selection +- */ + public Point getActiveCell() { + Point p = new Point(colActive, EndianConverter.readShort(rwActive)); + return p; + } + +- /** +- * Get the hex code for this particular BIFFRecord +- * +- * @return the hex code for Selection +- */ + public void setActiveCell(Point p) { + + colActive = (byte) p.getX(); +@@ -100,7 +90,7 @@ public class Selection implements BIFFRe + /** + * Reads a Selection Record from the InputStream + * +- * @param is InputStream containing a Pocket Excel Data file. ++ * @param input InputStream containing a Pocket Excel Data file. + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/StringValue.java +@@ -43,9 +43,9 @@ public class StringValue implements BIFF + private byte[] rgch; + + /** +- * Constructs a StringValue Record from an InputStream ++ * Constructs a StringValue Record from a String + * +- * @param is InputStream containing a StringValue Record ++ * @param str + */ + 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 InputStream + * +- * @param is InputStream containing a StringValue Record ++ * @param input InputStream containing a StringValue Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window1.java +@@ -87,7 +87,7 @@ public class Window1 implements BIFFReco + /** + * Reads a Window1 Record from an InputStream + * +- * @param is InputStream containing a Window1 Record ++ * @param input InputStream containing a Window1 Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Window2.java +@@ -123,7 +123,7 @@ public class Window2 implements BIFFReco + /** + * Reads a Window2 Record from an InputStream + * +- * @param is InputStream containing a Window2 Record ++ * @param input InputStream containing a Window2 Record + */ + public int read(InputStream input) throws IOException { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java +@@ -236,7 +236,7 @@ OfficeConstants { + /** + * Adds a ExtendedFormat record to the workbook + * +- * @param f the font recrod to add ++ * @param fmt the font record to add + */ + public int addExtendedFormat(Format fmt) throws IOException { + +@@ -358,7 +358,7 @@ OfficeConstants { + /** + * Adds a Worksheet to the workbook. + * +- * @return name the name of the Worksheet to be added ++ * @param name the name of the Worksheet to be added + */ + public void addWorksheet(String name) throws IOException { + +@@ -372,7 +372,6 @@ OfficeConstants { + /** + * Adds a cell to the current worksheet. + * +- * @return the name of the Worksheet to be added + */ + public void addCell(int row,int col, Format fmt, String cellContents) + throws IOException { +@@ -466,12 +465,6 @@ 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); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java +@@ -56,25 +56,18 @@ public class Worksheet { + private BeginningOfFile bof; + private Eof eof; + +- /** +- * Writes the current workbook to the Outputstream +- * +- * @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 Outputstream ++ * Writes the current workbook to the OutputStream + * + * @param os The destination outputstream + */ +@@ -229,7 +222,7 @@ public class Worksheet { + * Adds a cell to this worksheet. Current valdid celltypes are + * FloatNumber, LabelCell or Formula + * +- * @param f the font recrod to add ++ * @param br + */ + public void addCell(BIFFRecord br) { + cells.add(br); +@@ -239,7 +232,7 @@ public class Worksheet { + * Adds a number of ColInfo Records to the worksheet base on a list of + * clumnwidths passed in + * +- * @param list of column widths ++ * @param r list of column widths + */ + public void addRow(Row r) { + rows.add(r); +@@ -249,16 +242,12 @@ public class Worksheet { + * Adds a number of ColInfo Records to the worksheet base on a list of + * clumnwidths passed in + * +- * @param list of column widths ++ * @param c list of column widths + */ + public void addCol(ColInfo c) { + colInfo.add(c); + } +- /** +- * Returns an Enumeration to the ColInfo's for this worksheet +- * +- * @return an Enumeration to the ColInfo's +- */ ++ + public void addSettings(SheetSettings s) { + + sel.setActiveCell(s.getCursor()); +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaCompiler.java +@@ -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 + * +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java.orig 2014-02-25 08:29:14 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java +@@ -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.

      +- * 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 { + +--- xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java.orig 2014-02-25 08:29:13 UTC ++++ xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java +@@ -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 + * 

      +  *	<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  The String which is to be identified
++	 * @param op The String 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 String.
+ 	 * 
+-	 * @return a String representing a logical operator
++	 * @return a String representing a logical operator
+ 	 */
+ 	private String getLogicalOperator() throws FormulaParsingException {
+ 		String op = new String();

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***