Skip to content

Commit 09e466a

Browse files
Pieter12345cmaglie
authored andcommitted
Replace StringUtils.join() with library call
Use Apache commons.lang3 instead of own implementation.
1 parent a08908a commit 09e466a

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

app/test/processing/app/helpers/StringUtilsTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
package processing.app.helpers;
3131

32+
import org.apache.commons.lang3.StringUtils;
3233
import org.junit.Test;
3334

3435
import static org.junit.Assert.assertEquals;

arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import java.util.ArrayList;
3737
import java.util.List;
3838

39+
import org.apache.commons.lang3.StringUtils;
40+
3941
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
4042
import com.fasterxml.jackson.annotation.PropertyAccessor;
4143
import com.fasterxml.jackson.core.JsonFactory;
@@ -48,7 +50,6 @@
4850
import cc.arduino.packages.BoardPort;
4951
import cc.arduino.packages.Discovery;
5052
import processing.app.PreferencesData;
51-
import processing.app.helpers.StringUtils;
5253

5354
public class PluggableDiscovery implements Discovery {
5455

arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import processing.app.helpers.PreferencesMap;
4545
import processing.app.helpers.PreferencesMapException;
4646
import processing.app.helpers.StringReplacer;
47-
import processing.app.helpers.StringUtils;
4847

4948
import java.io.File;
5049
import java.io.IOException;
@@ -54,6 +53,8 @@
5453
import java.util.List;
5554
import java.util.Set;
5655

56+
import org.apache.commons.lang3.StringUtils;
57+
5758
import static processing.app.I18n.tr;
5859

5960
public class SSHUploader extends Uploader {

arduino-core/src/processing/app/helpers/StringUtils.java

-8
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,4 @@ public static String rtrim(String s) {
1515
}
1616
return s.substring(0, i + 1);
1717
}
18-
19-
public static String join(String[] arr, String separator) {
20-
StringBuffer sb = new StringBuffer();
21-
for (String s : arr) {
22-
sb.append(s).append(separator);
23-
}
24-
return sb.substring(0, sb.length() - separator.length());
25-
}
2618
}

0 commit comments

Comments
 (0)