Tune method names

Author: ngocdaothanh

src/main/java/scalive/Classpath.java

@@ -55,22 +55,22 @@ public static void findAndAddJar(URLClassLoader cl, String[] jarpaths, String ja
     }
 
     /**
-     * Similar to findAndAddJar, but only add the JAR to classpath if the
-     * representativeClass has not been loaded.
+     * Similar to findAndAddJar without representativeClass, but only find and
+     * add the JAR to classpath if the representativeClass has not been loaded.
      */
-    public static void addJarToURLClassLoader(
+    public static void findAndAddJar(
         URLClassLoader cl, String[] jarpaths, String jarbase, String representativeClass
     ) throws Exception {
         try {
             Class.forName(representativeClass, true, cl);
         } catch (ClassNotFoundException e) {
             System.out.println("[Scalive] Load " + jarbase);
-            Classpath.findAndAddJar(cl, jarpaths, jarbase);
+            findAndAddJar(cl, jarpaths, jarbase);
         }
     }
 
     // http://stackoverflow.com/questions/4121567/embedded-scala-repl-inherits-parent-classpath
-    public static String getURLClasspath(URLClassLoader cl) {
+    public static String getClasspath(URLClassLoader cl) {
         URL[] urls = cl.getURLs();
         return join(urls, File.pathSeparator);
     }
@@ -81,6 +81,8 @@ public static String getScalaVersion(ClassLoader cl) throws Exception {
         return (String) m.invoke(k);
     }
 
+    //--------------------------------------------------------------------------
+
     private static String join(Object[] xs, String separator) {
         StringBuffer buf = new StringBuffer();
         for (Object x: xs) {

src/main/java/scalive/Server.java

@@ -27,7 +27,7 @@ public static void serve(Socket client, String[] jarpaths) throws Exception {
             URLClassLoader cl = (URLClassLoader) ClassLoader.getSystemClassLoader();
             addJarsToURLClassLoader(cl, jarpaths);
 
-            String   classpath = Classpath.getURLClasspath(cl);
+            String   classpath = Classpath.getClasspath(cl);
             Class<?> repl      = Class.forName("scalive.Repl");
             Method   method    = repl.getMethod("run", ClassLoader.class, String.class, InputStream.class, OutputStream.class);
             method.invoke(null, cl, classpath, in, out);
@@ -42,14 +42,14 @@ public static void serve(Socket client, String[] jarpaths) throws Exception {
 
     private static void addJarsToURLClassLoader(URLClassLoader cl, String[] jarpaths) throws Exception {
         // Try scala-library first
-        Classpath.addJarToURLClassLoader(cl, jarpaths, "scala-library-" + DEFAULT_SCALA_VERSION, "scala.AnyVal");
+        Classpath.findAndAddJar(cl, jarpaths, "scala-library-" + DEFAULT_SCALA_VERSION, "scala.AnyVal");
 
         // So that we can get the actual Scala version being used
         String version = Classpath.getScalaVersion(cl);
 
-        Classpath.addJarToURLClassLoader(cl, jarpaths, "scala-reflect-"  + version, "scala.reflect.runtime.JavaUniverse");
-        Classpath.addJarToURLClassLoader(cl, jarpaths, "scala-compiler-" + version, "scala.tools.nsc.interpreter.ILoop");
+        Classpath.findAndAddJar(cl, jarpaths, "scala-reflect-"  + version, "scala.reflect.runtime.JavaUniverse");
+        Classpath.findAndAddJar(cl, jarpaths, "scala-compiler-" + version, "scala.tools.nsc.interpreter.ILoop");
 
-        Classpath.addJarToURLClassLoader(cl, jarpaths, "scalive", "scalive.Repl");
+        Classpath.findAndAddJar(cl, jarpaths, "scalive", "scalive.Repl");
     }
 }