Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify isSameLenght implementations by reusing getLength. This also fixes a lot of the useless paranthesis warnings generated by PMD. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1671622 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benedikt Ritter 2015-04-06 17:58:46 +00:00
parent 921ee58640
commit 319588b45c
1 changed files with 9 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/org/apache/commons/lang3/ArrayUtils.java
View File

@ -1227,12 +1227,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final Object[] array1, final Object[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1245,12 +1240,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final long[] array1, final long[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1263,12 +1253,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final int[] array1, final int[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1281,12 +1266,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final short[] array1, final short[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1299,12 +1279,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final char[] array1, final char[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1317,12 +1292,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final byte[] array1, final byte[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1335,12 +1305,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final double[] array1, final double[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1353,12 +1318,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final float[] array1, final float[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
/**
@ -1371,12 +1331,7 @@ public class ArrayUtils {
* {@code null} as an empty array
*/
public static boolean isSameLength(final boolean[] array1, final boolean[] array2) {
if ((array1 == null && array2 != null && array2.length > 0) ||
(array2 == null && array1 != null && array1.length > 0) ||
(array1 != null && array2 != null && array1.length != array2.length)) {
return false;
}
return true;
return getLength(array1) == getLength(array2);
}
//-----------------------------------------------------------------------