You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2018/10/11 16:53:52 UTC
svn commit: r1843571 [3/3] - in /openoffice/branches/AOO416: ./
ext_libraries/serf/ main/ main/javaunohelper/com/sun/star/comp/helper/
main/javaunohelper/com/sun/star/lib/uno/helper/ main/redland/
main/redland/prj/ main/redland/raptor/ main/redland/ras...
Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java (original)
+++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java Thu Oct 11 16:53:51 2018
@@ -54,7 +54,7 @@ import org.openoffice.xmerge.converter.x
* If there are more objects in the original sequence than the modified
* sequence, then all the extra one in the modified sequence are marked
* as delete.
- * </li></ol>
+ * </li></ol></p>
*
* <p>NOTE: The algorithm will have potential side effect to split rows.</p>
*
Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java (original)
+++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java Thu Oct 11 16:53:51 2018
@@ -48,7 +48,7 @@ public final class TextNodeIterator exte
/**
* Standard constructor.
*
- * @param node The initial root <code>Node</code>.
+ * @param initial The initial root <code>Node</code>.
*/
public TextNodeIterator(Node node) {
super(null, node);
Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java (original)
+++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java Thu Oct 11 16:53:51 2018
@@ -45,7 +45,7 @@ public class SheetUtil {
* Remove all of the supported attributes.
* </li><li>
* Remove the first <i>text:p</i> <code>Node</code> for most of the cells.
- * </li></ul>
+ * </li></ul></p>
*
* @param cc The <code>ConverterCapabilities</code>.
* @param node The <code>Node</code>.
Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java (original)
+++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java Thu Oct 11 16:53:51 2018
@@ -108,7 +108,7 @@ public class ColourConverter {
* cases where the 16 colour values are something other than there default
* values (e.g. in the case of pocket Excel)
*
- * @param lookup a 16 bit array mapping the 16 colours to their values
+ * @param short[] a 16 bit array mapping the 16 colours to there 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 colour The index into Pocket Word's colour table.
+ * @param index The index into Pocket Word's colour table.
*
* @return A Color object representing the RGB value of the Pocket Word
* colour.
@@ -257,7 +257,7 @@ public class ColourConverter {
int blue = colour.getBlue();
// We need to convert the pale colors to their base color rather than
- // white so we modify the rgb values if the colour is sufficiently
+ // white so we modify the rgb values if the colour is sufficently
// white
if(red>0xC0 && green>0xC0 && blue>0xC0) {
@@ -307,7 +307,7 @@ public class ColourConverter {
* is closest to White.
*
* Shades of grey will be converted to either Silver or White, where
- * Grey may be a more appropriate colour. This is handled specially
+ * Grey may be a more appropraite colour. This is handled specially
* only for Silver and White matches.
*/
switch (matchedRGB) {
Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java (original)
+++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java Thu Oct 11 16:53:51 2018
@@ -39,7 +39,7 @@ import java.util.Properties;
/**
* This class is used for logging debug messages.
* Currently, there are three types of logging: {@link #INFO},
- * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties
+ * {@link #TRACE} & {@link #ERROR}. Use the Debug.properties
* file to set or unset each type. Also use Debug.properties
* to set the writer to either <code>System.out</code>,
* <code>System.err</code>, or to a file.
@@ -265,7 +265,7 @@ public final class Debug {
* <p>This logs the message during runtime if debug.info or debug.trace
* in the properties file is set to true.</p>
*
- * @param flag Log type, one of the Debug constants
+ * @param int 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 flag Log type, one of the Debug constants
+ * @param int Log type, one of the Debug constants
* {@link #INFO}, {@link #TRACE}, {@link #ERROR}
* or a combination of which or'ed together.
* @param msg The message.
Modified: openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java (original)
+++ openoffice/branches/AOO416/main/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java Thu Oct 11 16:53:51 2018
@@ -53,7 +53,7 @@ public final class ConverterInfoMgr {
* and must have non-null values for DisplayName, ClassImpl,
* OfficeMime, and DeviceMime.
*
- * @param ci A <code>ConverterInfo</code> object
+ * @param ConverterInfo A <code>ConverterInfo</code> object
* describing a plug-in.
*
* @throws RegistryException If the <code>ConverterInfo</code>
@@ -109,16 +109,16 @@ public final class ConverterInfoMgr {
/**
- * Adds an <code>Enumeration</code> of converter plug-ins to the registry.
- * Each <code>ConverterInfo</code> in the <code>Enumeration</code> must have
+ * Adds a <code>Vector</code> of converter plug-ins to the registry.
+ * Each <code>ConverterInfo</code> in the <code>Vector</code> must have
* a unique DisplayName and must have non-null values for DisplayName,
* ClassImpl, OfficeMime, and DeviceMime.
*
- * @param jarEnum An <code>Enumeration</code> of <code>ConverterInfo</code>
+ * @param ciVectory A <code>Vector</code> of <code>ConverterInfo</code>
* objects describing one or more plug-in(s).
*
* @throws RegistryException If a <code>ConverterInfo</code> in the
- * <code>Enumeration</code> is not valid.
+ * <code>Vector</code> is not valid.
*/
public static void addPlugIn(Enumeration jarEnum) throws RegistryException {
@@ -257,8 +257,8 @@ public final class ConverterInfoMgr {
* If there are multiple <code>ConverterInfo</code> objects that
* support this conversion, only the first is returned.
*
- * @param deviceFromMime The device from mime.
- * @param deviceToMime The device to mime.
+ * @param deviceMimeFrom The device from mime.
+ * @param deviceMimeTo The device to mime.
*
* @return An array of two <code>ConverterInfo</code> objects
* that can be chained to perform the specified
Modified: openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl?rev=1843571&r1=1843570&r2=1843571&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl (original)
+++ openoffice/branches/AOO416/main/xmerge/workben/jstyle.pl Thu Oct 11 16:53:51 2018
@@ -238,7 +238,7 @@ line: while (<STDIN>) {
}
}
# this is the fastest way to check line length,
-# but it doesn't work with perl 3.0.
+# but it doesnt work with perl 3.0.
# if ($line =~ tr/\t/\t/ * 7 + length($line) > 80) {
# $pos = $oldp = $p = 0;
# while (($p = index($line, "\t", $p)) >= 0) {