Changeset 13097

Timestamp:

12/17/10 22:16:27 (11 years ago)

Author:

ehuelsmann

Message:

Remove redundant function [toURL(Pathname p)] from Pathname.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• JavaClassLoader.java (modified) (1 diff)
• Pathname.java (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/JavaClassLoader.java

@@ -233 +233 @@
 
     protected static void addURL(JavaClassLoader jcl, LispObject jar) {
-  try {
-      if(jar instanceof Pathname) {
-    jcl.addURL(((Pathname) jar).toURL());
-      } else if(jar instanceof AbstractString) {
-    jcl.addURL(new Pathname(jar.toString()).toURL());
-      } else {
-    error(new TypeError(jar + " must be a pathname designator"));
-      }
-  } catch(java.net.MalformedURLException e) {
-      error(new LispError(jar + " is not a valid URL"));
-  }
+        if (jar instanceof Pathname) {
+            jcl.addURL(((Pathname) jar).toURL());
+        } else if (jar instanceof AbstractString) {
+            jcl.addURL(new Pathname(jar.toString()).toURL());
+        } else {
+            error(new TypeError(jar + " must be a pathname designator"));
+        }
     }
 

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -998 +998 @@
     }
 
-    public static URL toURL(Pathname p) {
-        URL url = null;
-        if (!(p.host instanceof Cons)) {
-            Debug.assertTrue(false); // XXX
-        }
-        try {
-            url = new URL(p.getNamestring());
-        } catch (MalformedURLException e) {
-            Debug.assertTrue(false); // XXX
-        }
-        return url;
-    }
+//    public static URL toURL(Pathname p) {
+ //       try {
+//            return p.toURL();
+//        } catch (MalformedURLException e) {
+//            Debug.assertTrue(false);
+//            return null; // not reached
+//        }
+//    }
 
     URLConnection getURLConnection() {
         Debug.assertTrue(isURL());
-        URL url = Pathname.toURL(this);
+        URL url = this.toURL();
         URLConnection result = null;
         try {
@@ -2164 +2160 @@
             }
         } else if (isURL()) {
-            URL url = toURL(this);
+            URL url = this.toURL();
             try { 
                 result = url.openStream();
@@ -2382 +2378 @@
     }
 
-    public URL toURL() throws MalformedURLException {
-        if(isURL()) {
-            return new URL(getNamestring());
-        } else {
-            return toFile().toURL();
+    public URL toURL() {
+        try {
+            if (isURL()) {
+                return new URL(getNamestring());
+            } else {
+                return toFile().toURL();
+            }
+        } catch (MalformedURLException e) {
+            error(new LispError(getNamestring() + " is not a valid URL"));
+            return null; // not reached
         }
     }