Changeset 13097
- Timestamp:
- 12/17/10 22:16:27 (11 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/JavaClassLoader.java
r12802 r13097 233 233 234 234 protected static void addURL(JavaClassLoader jcl, LispObject jar) { 235 try { 236 if(jar instanceof Pathname) { 237 jcl.addURL(((Pathname) jar).toURL()); 238 } else if(jar instanceof AbstractString) { 239 jcl.addURL(new Pathname(jar.toString()).toURL()); 240 } else { 241 error(new TypeError(jar + " must be a pathname designator")); 242 } 243 } catch(java.net.MalformedURLException e) { 244 error(new LispError(jar + " is not a valid URL")); 245 } 235 if (jar instanceof Pathname) { 236 jcl.addURL(((Pathname) jar).toURL()); 237 } else if (jar instanceof AbstractString) { 238 jcl.addURL(new Pathname(jar.toString()).toURL()); 239 } else { 240 error(new TypeError(jar + " must be a pathname designator")); 241 } 246 242 } 247 243 -
trunk/abcl/src/org/armedbear/lisp/Pathname.java
r13056 r13097 998 998 } 999 999 1000 public static URL toURL(Pathname p) { 1001 URL url = null; 1002 if (!(p.host instanceof Cons)) { 1003 Debug.assertTrue(false); // XXX 1004 } 1005 try { 1006 url = new URL(p.getNamestring()); 1007 } catch (MalformedURLException e) { 1008 Debug.assertTrue(false); // XXX 1009 } 1010 return url; 1011 } 1000 // public static URL toURL(Pathname p) { 1001 // try { 1002 // return p.toURL(); 1003 // } catch (MalformedURLException e) { 1004 // Debug.assertTrue(false); 1005 // return null; // not reached 1006 // } 1007 // } 1012 1008 1013 1009 URLConnection getURLConnection() { 1014 1010 Debug.assertTrue(isURL()); 1015 URL url = Pathname.toURL(this);1011 URL url = this.toURL(); 1016 1012 URLConnection result = null; 1017 1013 try { … … 2164 2160 } 2165 2161 } else if (isURL()) { 2166 URL url = t oURL(this);2162 URL url = this.toURL(); 2167 2163 try { 2168 2164 result = url.openStream(); … … 2382 2378 } 2383 2379 2384 public URL toURL() throws MalformedURLException { 2385 if(isURL()) { 2386 return new URL(getNamestring()); 2387 } else { 2388 return toFile().toURL(); 2380 public URL toURL() { 2381 try { 2382 if (isURL()) { 2383 return new URL(getNamestring()); 2384 } else { 2385 return toFile().toURL(); 2386 } 2387 } catch (MalformedURLException e) { 2388 error(new LispError(getNamestring() + " is not a valid URL")); 2389 return null; // not reached 2389 2390 } 2390 2391 }
Note: See TracChangeset
for help on using the changeset viewer.