diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-28 09:22:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-28 09:22:29 -0500 |
commit | 9f3c5f3a36ea70a8dec03b048cc41b6579eb6c4b (patch) | |
tree | 13ce0083a15f7289682dc2fd6bf5066d25ee52cd /nailgun_launcher/Stage0Lib.java | |
parent | fdb5d7cdb692ded3ccc1d865282169598d190c03 (diff) | |
parent | 03b066827b3d397fb30a689904fa8d55db43fc8e (diff) | |
download | cbt-9f3c5f3a36ea70a8dec03b048cc41b6579eb6c4b.tar.gz cbt-9f3c5f3a36ea70a8dec03b048cc41b6579eb6c4b.tar.bz2 cbt-9f3c5f3a36ea70a8dec03b048cc41b6579eb6c4b.zip |
Merge pull request #358 from cvogt/chris
various changes
Diffstat (limited to 'nailgun_launcher/Stage0Lib.java')
-rw-r--r-- | nailgun_launcher/Stage0Lib.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/nailgun_launcher/Stage0Lib.java b/nailgun_launcher/Stage0Lib.java index 0880bbd..6057c21 100644 --- a/nailgun_launcher/Stage0Lib.java +++ b/nailgun_launcher/Stage0Lib.java @@ -45,7 +45,7 @@ public class Stage0Lib{ public static String classpath( String... files ){ Arrays.sort(files); - return join( pathSeparator, files ); + return mkString( pathSeparator, files ); } public static long lastModified( String... files ){ @@ -216,10 +216,10 @@ public class Stage0Lib{ return (new HexBinaryAdapter()).marshal(sha1.digest()).toLowerCase(); } - public static String join(String separator, String[] parts){ - String result = parts[0]; + public static String mkString(String separator, Object[] parts){ + String result = parts[0].toString(); for(int i = 1; i < parts.length; i++){ - result += separator + parts[i]; + result += separator + parts[i].toString(); } return result; } @@ -229,4 +229,10 @@ public class Stage0Lib{ copy[array.length] = item; return copy; } + + public static String[] concat( String[] left, String[] right ){ + String[] result = Arrays.copyOf(left, left.length + right.length); + System.arraycopy(right, 0, result, left.length, right.length); + return result; + } } |