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

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-lang

This commit is contained in:
pascalschumacher 2017-03-27 20:42:48 +02:00
parent 46edb45d3e b06f13ff0e
commit 30d4070af9
2 changed files with 75 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8098,7 +8098,6 @@ public class ArrayUtils {
return result; return result;
} }
/** /**
* <p>Inserts elements into an array at the given index (starting from zero).</p> * <p>Inserts elements into an array at the given index (starting from zero).</p>
* *
@ -8141,7 +8140,6 @@ public class ArrayUtils {
return result; return result;
} }
/** /**
* <p>Inserts elements into an array at the given index (starting from zero).</p> * <p>Inserts elements into an array at the given index (starting from zero).</p>
* *
@ -8184,7 +8182,6 @@ public class ArrayUtils {
return result; return result;
} }
/** /**
* <p>Inserts elements into an array at the given index (starting from zero).</p> * <p>Inserts elements into an array at the given index (starting from zero).</p>
* *
@ -8227,7 +8224,6 @@ public class ArrayUtils {
return result; return result;
} }
/** /**
* <p>Inserts elements into an array at the given index (starting from zero).</p> * <p>Inserts elements into an array at the given index (starting from zero).</p>
* *
@ -8354,7 +8350,6 @@ public class ArrayUtils {
return result; return result;
} }
/** /**
* <p>Inserts elements into an array at the given index (starting from zero).</p> * <p>Inserts elements into an array at the given index (starting from zero).</p>
* *
@ -8397,7 +8392,6 @@ public class ArrayUtils {
return result; return result;
} }
/** /**
* <p>Inserts elements into an array at the given index (starting from zero).</p> * <p>Inserts elements into an array at the given index (starting from zero).</p>
* *

5
src/main/java/org/apache/commons/lang3/StringUtils.java
View File

@ -7560,7 +7560,7 @@ public class StringUtils {
* @param maxWidth maximum length of result String, must be at least {@code abbrevMarker.length + 1} * @param maxWidth maximum length of result String, must be at least {@code abbrevMarker.length + 1}
* @return abbreviated String, {@code null} if null String input * @return abbreviated String, {@code null} if null String input
* @throws IllegalArgumentException if the width is too small * @throws IllegalArgumentException if the width is too small
* @since 3.5 * @since 3.6
*/ */
public static String abbreviate(final String str, final String abbrevMarker, final int maxWidth) { public static String abbreviate(final String str, final String abbrevMarker, final int maxWidth) {
return abbreviate(str, abbrevMarker, 0, maxWidth); return abbreviate(str, abbrevMarker, 0, maxWidth);
@ -7601,7 +7601,7 @@ public class StringUtils {
* @param maxWidth maximum length of result String, must be at least 4 * @param maxWidth maximum length of result String, must be at least 4
* @return abbreviated String, {@code null} if null String input * @return abbreviated String, {@code null} if null String input
* @throws IllegalArgumentException if the width is too small * @throws IllegalArgumentException if the width is too small
* @since 3.5 * @since 3.6
*/ */
public static String abbreviate(final String str, final String abbrevMarker, int offset, final int maxWidth) { public static String abbreviate(final String str, final String abbrevMarker, int offset, final int maxWidth) {
if (isEmpty(str) || isEmpty(abbrevMarker)) { if (isEmpty(str) || isEmpty(abbrevMarker)) {
@ -9138,7 +9138,6 @@ public class StringUtils {
return str; return str;
} }
/** /**
* <p>Converts a {@code CharSequence} into an array of code points.</p> * <p>Converts a {@code CharSequence} into an array of code points.</p>
* *