From 68d7a67b19d50f07750afdbeffa1cf633207806c Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Sun, 18 Oct 2015 08:20:07 +0000 Subject: 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) --- editors/openoffice-devel/files/patch-openjdk8 | 1808 +++++++++++++++++++++++++ 1 file changed, 1808 insertions(+) create mode 100644 editors/openoffice-devel/files/patch-openjdk8 (limited to 'editors/openoffice-devel/files') diff --git a/editors/openoffice-devel/files/patch-openjdk8 b/editors/openoffice-devel/files/patch-openjdk8 new file mode 100644 index 000000000000..22075f861565 --- /dev/null +++ b/editors/openoffice-devel/files/patch-openjdk8 @@ -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:

    + *

    ++ * + * + *

    There should be a total of header.numRecords + * of Record index info

    . +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java +@@ -134,7 +134,7 @@ public final class Record { + * Record length followed by the data in this + * Record object. + * +- * @param out The OutputStream to write the object. ++ * @param outs The OutputStream 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 InputStream. + * +- * @param in The InputStream to read data from ++ * @param ins The InputStream to read data from + * in order to restore the object. + * + * @throws IOException If any I/O error occurs. +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java +@@ -134,7 +134,7 @@ public class EmbeddedXMLObject extends E + /** + * Sets the settings data for the embedded object. + * +- * @param styles DOM representation of the object's styles. ++ * @param settings DOM representation of the object's styles. + */ + public void setSettingsDOM(Document settings) { + settingsDOM = settings; +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java +@@ -1119,7 +1119,7 @@ public abstract class OfficeDocument + + + /** +- *

    Hacked code to filter tag before ++ *

    Hacked code to filter <!DOCTYPE> tag before + * sending stream to parser.

    + * + *

    This hacked code needs to be changed later on.

    +@@ -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.

    + * +- *

    This is a simple hack that assumes the whole ++ *

    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 InputStream to be filtered. + * +- * @return Reader value without the tag. ++ * @return Reader value without the <!DOCTYPE> tag. + * + * @throws IOException If any I/O error occurs. + */ +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +@@ -123,26 +123,21 @@ class alignment extends conversionAlgori + /** + *

    This class represents a paragraph Style.

    + * +- *

    ++ * ++ *
    +- * Attribute Value +- *
    +- * MARGIN_LEFT mm * 100 +- *
    +- * MARGIN_RIGHT mm * 100 +- *
    +- * MARGIN_TOP mm * 100 (space on top of paragraph) +- *
    +- * MARGIN_BOTTOM mm * 100 +- *
    +- * TEXT_INDENT mm * 100 (first line indent) +- *
    +- * LINE_HEIGHT mm * 100, unless or'ed with LH_PCT, in which ++ *

    ++ * ++ * ++ * ++ * ++ * ++ * ++ * ++ *
    Properties
    AttributeValue
    MARGIN_LEFT mm * 100
    MARGIN_RIGHT mm * 100
    MARGIN_TOP mm * 100 (space on top of paragraph)
    MARGIN_BOTTOM mm * 100
    TEXT_INDENT mm * 100 (first line indent)
    LINE_HEIGHT 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. +- *
    +- * TEXT_ALIGN ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT +- *

    ++ *
    TEXT_ALIGN ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT
    + * + * @author David Proulx + */ +@@ -266,9 +261,9 @@ public class ParaStyle extends Style imp + * Constructor for use when going from client device format to DOM. + * + * @param name Name of the Style. Can be null. +- * @param family Family of the Style - usually ++ * @param familyName Family of the Style - usually + * paragraph, text, etc. Can be null. +- * @param parent Name of the parent Style, or null ++ * @param parentName Name of the parent Style, or null + * if none. + * @param attribs Array of attributes to set. + * @param values Array of values to set. +@@ -289,13 +284,13 @@ public class ParaStyle extends Style imp + * format to DOM. + * + * @param name Name of the Style. Can be null. +- * @param family Family of the Style - usually ++ * @param familyName Family of the Style - usually + * paragraph, text, etc. Can be null. +- * @param parent Name of the parent Style, or ++ * @param parentName Name of the parent Style, or + * null if none. + * @param attribs Array of attributes indices to set. + * @param values Array of values to set. +- * @param sc The StyleCatalog, which is used for ++ * @param lookup The StyleCatalog, which is used for + * looking up ancestor Style objects. + */ + public ParaStyle(String name, String familyName, String parentName, +@@ -373,7 +368,7 @@ public class ParaStyle extends Style imp + * Set an attribute for this paragraph Style. + * + * @param attr The attribute index to set. +- * @apram value The attribute value to set. ++ * @param value The attribute value to set. + */ + public void setAttribute(int attr, String value) { + isSet[attr] = true; +@@ -496,7 +491,7 @@ public class ParaStyle extends Style imp + /** + * Create the Node with the specified elements. + * +- * @parentDoc Parent Document of the ++ * @param parentDoc Document of the + * Node to create. + * @param name Name of the Node. + * +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java +@@ -207,7 +207,7 @@ public class StyleCatalog { + + + /** +- * Given a Style s return all ++ * Given a Style s return all + * Style objects that match. + * + * @param s Style to match. +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +@@ -74,7 +74,7 @@ public class TextStyle extends Style imp + /** + * Constructor for use when going from DOM to client device format. + * +- * @param Node The style:style Node containing ++ * @param node The style:style Node containing + * the Style. (This Node is + * assumed have a family attribute of text). + * @param sc The StyleCatalog, which is used for +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java +@@ -52,8 +52,7 @@ public class BookSettings implements Off + /** + * Default Constructor for a BookSettings + * +- * @param dimension if it's a row the height, a column the width +- * @param repeated ++ * @param root + */ + public BookSettings(Node root) { + readNode(root); +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +@@ -46,7 +46,7 @@ public class CellStyle extends Style imp + /** + * Constructor for use when going from DOM to client device format. + * +- * @param Node The style:style Node containing ++ * @param node The style:style Node containing + * the Style. (This Node is + * assumed have a family attribute of text). + * @param sc The StyleCatalog, which is used for +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java +@@ -46,8 +46,7 @@ public class ColumnRowInfo { + /** + * Constructor for a ColumnRowInfo + * +- * @param dimension if it's a row the height, a column the width +- * @param repeated ++ * @param type whether Row or column record + */ + public ColumnRowInfo(int type) { + +@@ -82,7 +81,7 @@ public class ColumnRowInfo { + /** + * sets the definition + * +- * @param newDefinition sets the definition ++ * @param fmt sets the definition + */ + public void setFormat(Format fmt) { + +@@ -110,9 +109,9 @@ public class ColumnRowInfo { + } + + /** +- * sets the definition ++ * Sets the definition + * +- * @param newDefinition sets the definition ++ * @param dimension + */ + public void setSize(int dimension) { + +@@ -128,11 +127,6 @@ public class ColumnRowInfo { + return repeated; + } + +- /** +- * Returns the base Cell address +- * +- * @return the base cell address +- */ + public void setRepeated(int repeated) { + + this.repeated = repeated; +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java +@@ -44,7 +44,7 @@ public class ColumnStyle extends Style i + /** + * Constructor for use when going from DOM to client device format. + * +- * @param Node The style:style Node containing ++ * @param node The style:style Node containing + * the Style. (This Node is + * assumed have a family attribute of text). + * @param sc The StyleCatalog, which is used for +@@ -97,7 +97,7 @@ public class ColumnStyle extends Style i + * text). Can be null. + * @param parent Name of parent text Style, or null + * for none. +- * @param mask the width of this column ++ * @param colWidth the width of this column + * @param sc The StyleCatalog, which is used for + * looking up ancestor Style objects. + */ +@@ -118,7 +118,7 @@ public class ColumnStyle extends Style i + /** + * Sets the width of this column + * +- * @return the Format object ++ * @param colWidth the column width + */ + public void setColWidth(int colWidth) { + +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java +@@ -49,7 +49,7 @@ import org.openoffice.xmerge.util.Debug; + * Generic small device implementation of DocumentMerger for + * the {@link + * org.openoffice.xmerge.converter.xml.sxc.SxcPluginFactory +- * SxcPluginFactory}. Used with SXC Document objects.

    ++ * SxcPluginFactory}. Used with SXC Document objects. + */ + public class DocumentMergerImpl implements DocumentMerger { + +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +@@ -295,7 +295,7 @@ public class Format implements Cloneable + /** + * Set the font used for this cell. + * +- * @param fontName The name of the font. ++ * @param fontSize + */ + public void setFontSize(int fontSize) { + sizeInPoints = fontSize; +@@ -312,9 +312,9 @@ public class Format implements Cloneable + } + + /** +- * Set the alignmen used for this cell. ++ * Set the alignment used for this cell. + * +- * @param fontName The name of the font. ++ * @param vertAlign + */ + public void setVertAlign(int vertAlign) { + this.vertAlign = vertAlign; +@@ -331,9 +331,9 @@ public class Format implements Cloneable + } + + /** +- * Set the alignmen used for this cell. ++ * Set the alignment used for this cell. + * +- * @param fontName The name of the font. ++ * @param align + */ + public void setAlign(int align) { + this.align = align; +@@ -351,7 +351,7 @@ public class Format implements Cloneable + /** + * Set the Foreground Color for this cell. + * +- * @param color A Color object representing the ++ * @param c A Color object representing the + * foreground color. + */ + public void setForeground(Color c) { +@@ -373,7 +373,7 @@ public class Format implements Cloneable + /** + * Set the Background Color for this cell + * +- * @param color A Color object representing ++ * @param c A Color object representing + * the background color. + */ + public void setBackground(Color c) { +@@ -433,7 +433,7 @@ public class Format implements Cloneable + * than this Style, and nothing it specifies + * contradicts this Style. + * +- * @param style The Style to check. ++ * @param rhs The Style to check. + * + * @return true if style is a subset, false + * otherwise. +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java +@@ -135,7 +135,7 @@ public class NameDefinition implements O + /** + * Writes out a content.xml entry for this NameDefinition object + * +- * @param settings a Document object representing the settings.xml ++ * @param doc a Document object representing the settings.xml + * @param root the root xml node to add to + */ + public void writeNode(org.w3c.dom.Document doc, Node root) { +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java +@@ -44,7 +44,7 @@ public class RowStyle extends Style impl + /** + * Constructor for use when going from DOM to client device format. + * +- * @param Node The style:style Node containing ++ * @param node The style:style Node containing + * the Style. (This Node is + * assumed have a family attribute of text). + * @param sc The StyleCatalog, which is used for +@@ -97,7 +97,7 @@ public class RowStyle extends Style impl + * text). Can be null. + * @param parent Name of parent text Style, or null + * for none. +- * @param mask The height of this row ++ * @param rowHeight The height of this row + * @param sc The StyleCatalog, which is used for + * looking up ancestor Style objects. + */ +@@ -118,9 +118,9 @@ public class RowStyle extends Style impl + /** + * Sets the height of this row + * +- * @return the Format object ++ * @param rowHeight the row height + */ +- public void setRowHeight(int RowHeight) { ++ public void setRowHeight(int rowHeight) { + + this.rowHeight = rowHeight; + } +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java +@@ -79,8 +79,7 @@ public class SheetSettings implements Of + /** + * Constructor for a ColumnRowInfo + * +- * @param dimension if it's a row the height, a column the width +- * @param repeated ++ * @param name + */ + public SheetSettings(String name) { + sheetName = name; +@@ -175,12 +174,10 @@ public class SheetSettings implements Of + + return posLeft; + } ++ + /** +- * Sets the top row visible in the lower pane and the leftmost column +- * visibile in the right pane. ++ * Gets the top row visible in the lower pane. + * +- * @param top The top row visible in the lower pane +- * @param left The leftmost column visibile in the right pane + */ + public int getTop() { + +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java +@@ -104,21 +104,13 @@ public abstract class SpreadsheetEncoder + * @param columnWidths An IntArrayList of column + * widths. + */ +- public abstract void setColumnRows(Vector columnRows) throws IOException; ++ public abstract void setColumnRows(Vector columnWidths) throws IOException; + + /** +- * Set the width of the columns in the WorkBook. +- * +- * @param columnWidths An IntArrayList of column +- * widths. + */ + public abstract void setNameDefinition(NameDefinition nd) throws IOException; + + /** +- * Set the width of the columns in the WorkBook. +- * +- * @param columnWidths An IntArrayList of column +- * widths. + */ + public abstract void addSettings(BookSettings s) throws IOException; + } +--- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java +@@ -44,7 +44,7 @@ import org.openoffice.xmerge.util.Debug; + * Xslt implementation of DocumentMerger + * for the {@link + * org.openoffice.xmerge.converter.xml.xslt.PluginFactoryImpl +- * PluginFactoryImpl}.

    ++ * PluginFactoryImpl}. + */ + public class DocumentMergerImpl implements DocumentMerger { + +--- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java +@@ -40,15 +40,12 @@ public interface MergeAlgorithm { + * This method is to merge the difference to an Iterator. + * The original Iterator will be modified after the call. + * +- * @param objSeq The original sequence which the difference ++ * @param orgSeq The original sequence which the difference + * will be applied. It will be modified. + * @param modSeq The modified sequence where the difference + * content will be extracted. + * @param differences The Difference array. + * +- * @return An Iterator which is the modified original +- * Iterator Sequence. Same as the first parameter. +- * + * @throws MergeException If an error occurs during the merge. + */ + public void applyDifference(Iterator orgSeq, Iterator modSeq, +--- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java +@@ -43,6 +43,6 @@ public interface NodeMergeAlgorithm { + * @param modifyNode The Node to be merged. It may + * be modified. + */ +- public void merge(Node orginialNode, Node modifyNode); ++ public void merge(Node originalNode, Node modifyNode); + } + +--- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java +@@ -54,7 +54,7 @@ import org.openoffice.xmerge.converter.x + * If there are more objects in the original sequence than the modified + * sequence, then all the extra one in the modified sequence are marked + * as delete. +- *

    ++ * + * + *

    NOTE: The algorithm will have potential side effect to split rows.

    + * +--- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java +@@ -48,7 +48,7 @@ public final class TextNodeIterator exte + /** + * Standard constructor. + * +- * @param initial The initial root Node. ++ * @param node The initial root Node. + */ + public TextNodeIterator(Node node) { + super(null, node); +--- xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java.orig 2014-02-25 08:29:05 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java +@@ -45,7 +45,7 @@ public class SheetUtil { + * Remove all of the supported attributes. + *
  • + * Remove the first text:p Node for most of the cells. +- *

    • ++ * + * + * @param cc The ConverterCapabilities. + * @param node The Node. +--- xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java +@@ -108,7 +108,7 @@ public class ColourConverter { + * cases where the 16 colour values are something other than there default + * values (e.g. in the case of pocket Excel) + * +- * @param short[] a 16 bit array mapping the 16 colours to there values ++ * @param lookup a 16 bit array mapping the 16 colours to their values + */ + public ColourConverter(short lookup[]) { + +@@ -151,7 +151,7 @@ public class ColourConverter { + * This method maps a Pocket Word colour index value to an RGB value as + * used by OpenOffice. + * +- * @param index The index into Pocket Word's colour table. ++ * @param colour The index into Pocket Word's colour table. + * + * @return A Color object representing the RGB value of the Pocket Word + * colour. +--- xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java +@@ -39,7 +39,7 @@ import java.util.Properties; + /** + * This class is used for logging debug messages. + * Currently, there are three types of logging: {@link #INFO}, +- * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties ++ * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties + * file to set or unset each type. Also use Debug.properties + * to set the writer to either System.out, + * System.err, or to a file. +@@ -265,7 +265,7 @@ public final class Debug { + *

    This logs the message during runtime if debug.info or debug.trace + * in the properties file is set to true.

    + * +- * @param int Log type, one of the Debug constants ++ * @param flag Log type, one of the Debug constants + * {@link #INFO}, {@link #TRACE}, {@link #ERROR} + * or a combination of which or'ed together. + * @param msg The message. +@@ -287,7 +287,7 @@ public final class Debug { + * of the exception passed in. Refer to the other log method + * for description. + * +- * @param int Log type, one of the Debug constants ++ * @param flag Log type, one of the Debug constants + * {@link #INFO}, {@link #TRACE}, {@link #ERROR} + * or a combination of which or'ed together. + * @param msg The message. +--- xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java.orig 2014-02-25 08:29:06 UTC ++++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java +@@ -53,7 +53,7 @@ public final class ConverterInfoMgr { + * and must have non-null values for DisplayName, ClassImpl, + * OfficeMime, and DeviceMime. + * +- * @param ConverterInfo A ConverterInfo object ++ * @param ci A ConverterInfo object + * describing a plug-in. + * + * @throws RegistryException If the ConverterInfo +@@ -109,16 +109,16 @@ public final class ConverterInfoMgr { + + + /** +- * Adds a Vector of converter plug-ins to the registry. +- * Each ConverterInfo in the Vector must have ++ * Adds an Enumeration of converter plug-ins to the registry. ++ * Each ConverterInfo in the Enumeration must have + * a unique DisplayName and must have non-null values for DisplayName, + * ClassImpl, OfficeMime, and DeviceMime. + * +- * @param ciVectory A Vector of ConverterInfo ++ * @param jarEnum An Enumeration of ConverterInfo + * objects describing one or more plug-in(s). + * + * @throws RegistryException If a ConverterInfo in the +- * Vector is not valid. ++ * Enumeration is not valid. + */ + public static void addPlugIn(Enumeration jarEnum) throws RegistryException { + +@@ -257,8 +257,8 @@ public final class ConverterInfoMgr { + * If there are multiple ConverterInfo objects that + * support this conversion, only the first is returned. + * +- * @param deviceMimeFrom The device from mime. +- * @param deviceMimeTo The device to mime. ++ * @param deviceFromMime The device from mime. ++ * @param deviceToMime The device to mime. + * + * @return An array of two ConverterInfo objects + * that can be chained to perform the specified -- cgit v1.2.3