aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-02-27 06:35:59 +0800
committerChristopher Vogt <oss.nsp@cvogt.org>2017-02-27 18:53:41 +0800
commit9910ef2ecdb2043e216bd99c7b22360db4c0c41d (patch)
treef490edbe6e4b0ab27740bc12709b574247744248
parentde1faad1e832f9af8e443e161166779c78e1d811 (diff)
downloadcbt-9910ef2ecdb2043e216bd99c7b22360db4c0c41d.tar.gz
cbt-9910ef2ecdb2043e216bd99c7b22360db4c0c41d.tar.bz2
cbt-9910ef2ecdb2043e216bd99c7b22360db4c0c41d.zip
minor helper method name change to match scala’s method naming
also Object is easier in java due to lack of .map(…) on arrays
-rw-r--r--nailgun_launcher/CbtURLClassLoader.java2
-rw-r--r--nailgun_launcher/ClassLoaderCache.java2
-rw-r--r--nailgun_launcher/Stage0Lib.java8
3 files changed, 6 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..725d7c7 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;
}