Merge pull request #358 from cvogt/chris

various changes

3 files changed, 12 insertions, 6 deletions

diff --git a/nailgun_launcher/CbtURLClassLoader.java b/nailgun_launcher/CbtURLClassLoader.java
index 10add77..b7eb366 100644
--- a/nailgun_launcher/CbtURLClassLoader.java
+++ b/nailgun_launcher/CbtURLClassLoader.java
@@ -11,7 +11,7 @@ public class CbtURLClassLoader extends java.net.URLClassLoader{
       + "(\n  "
       + Arrays.toString(getURLs())
       + ",\n  "
-      + join("\n  ",(getParent() == null?"":getParent().toString()).split("\n"))
+      + mkString("\n  ",(getParent() == null?"":getParent().toString()).split("\n"))
       + "\n)"
     );
   }
diff --git a/nailgun_launcher/ClassLoaderCache.java b/nailgun_launcher/ClassLoaderCache.java
index 6bffad0..4898687 100644
--- a/nailgun_launcher/ClassLoaderCache.java
+++ b/nailgun_launcher/ClassLoaderCache.java
@@ -55,7 +55,7 @@ final public class ClassLoaderCache{
     for( Object key: hashMap.keySet() ){
       if( key instanceof String )
         res.append(
-          join( "\n", key.toString().split(":") ) + " -> " + hashMap.get( hashMap.get(key) )
+          mkString( "\n", key.toString().split(":") ) + " -> " + hashMap.get( hashMap.get(key) )
           + "\n\n"
         );
     }
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;
+  }
 }