Stephen Colebourne wrote:
Unfortunately its the patch format thats wrong (Eclipse doesn't like it).
See:
http://jakarta.apache.org/commons/patches.html
(I think its the -u you're missing)
You're right, I did miss the -u switch. Thats what happens when you try
to use an GUI-application... :)
Index: StringUtils.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons/lang/src/java/org/apache/commons/lang/StringUtils.java,v
retrieving revision 1.22
diff -u -r1.22 StringUtils.java
--- StringUtils.java 14 Nov 2002 22:29:25 -0000 1.22
+++ StringUtils.java 15 Nov 2002 00:12:53 -0000
@@ -1527,7 +1527,7 @@
* Returns either the passed in Object as a String, or,
* if the Object is <code>null</code>, an empty String.
*
- * @param str the Object to check
+ * @param obj the Object to check
* @return the passed in Object's toString, or blank if it was null
*/
public static String defaultString(Object obj) {
Index: ArrayUtils.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons/lang/src/java/org/apache/commons/lang/ArrayUtils.java,v
retrieving revision 1.2
diff -u -r1.2 ArrayUtils.java
--- ArrayUtils.java 14 Nov 2002 22:29:25 -0000 1.2
+++ ArrayUtils.java 15 Nov 2002 00:12:53 -0000
@@ -397,7 +397,8 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
*/
public static boolean isSameLength(Object[] array1, Object[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
@@ -415,8 +416,9 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
- */
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
+ */
public static boolean isSameLength(long[] array1, long[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
@@ -433,8 +435,9 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
- */
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
+ */
public static boolean isSameLength(int[] array1, int[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
@@ -451,8 +454,9 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
- */
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
+ */
public static boolean isSameLength(short[] array1, short[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
@@ -469,8 +473,9 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
- */
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
+ */
public static boolean isSameLength(byte[] array1, byte[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
@@ -487,8 +492,9 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
- */
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
+ */
public static boolean isSameLength(double[] array1, double[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
@@ -505,8 +511,9 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
- */
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
+ */
public static boolean isSameLength(float[] array1, float[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
@@ -523,8 +530,9 @@
*
* @param array1 the first array, may be <code>null</code>
* @param array2 the second array, may be <code>null</code>
- * @param true if length of arrays matches, treating <code>null</code> as an
empty array
- */
+ * @return <code>true</code> if length of arrays matches, treating
+ * <code>null</code> as an empty array
+ */
public static boolean isSameLength(boolean[] array1, boolean[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
@@ -540,7 +548,7 @@
*
* @param array1 the first array, must not be <code>null</code>
* @param array2 the second array, must not be <code>null</code>
- * @param true if type of arrays matches
+ * @return <code>true</code> if type of arrays matches
* @throws IllegalArgumentException if either array is <code>null</code>
*/
public static boolean isSameType(Object array1, Object array2) {
--
To unsubscribe, e-mail: <mailto:commons-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>
