Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-03-20 00:00:03 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 3.0-structure

Browse Source 
Conflicts:
	imageio/imageio-psd/pom.xml
	twelvemonkeys-imageio/pom.xml
	twelvemonkeys-servlet/pom.xml
This commit is contained in:
Erlend Hamnaberg
2010-01-29 19:27:10 +01:00
parent f8b716687c c310083d2a
commit 38d6c58eba
64 changed files with 3851 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/common-lang/src/main/java/com/twelvemonkeys/lang/StringUtil.java
View File

@@ -1572,7 +1572,7 @@ public final class StringUtil {
* @param pStringArray the string array
* @return A string of comma-separated values
*/
public static String toCSVString(String[] pStringArray) {
public static String toCSVString(Object[] pStringArray) {
return toCSVString(pStringArray, ", ");
}
@@ -1584,7 +1584,7 @@ public final class StringUtil {
* @return string of delimiter separated values
* @throws IllegalArgumentException if {@code pDelimiterString == null}
*/
public static String toCSVString(String[] pStringArray, String pDelimiterString) {
public static String toCSVString(Object[] pStringArray, String pDelimiterString) {
if (pStringArray == null) {
return "";
}