Index: src/org/xwt/Res.java =================================================================== RCS file: //xwt/src/org/xwt/Res.java,v retrieving revision 1.14 diff -u -r1.14 Res.java --- src/org/xwt/Res.java 28 Sep 2003 21:05:58 -0000 1.14 +++ src/org/xwt/Res.java 29 Sep 2003 00:52:10 -0000 @@ -144,9 +144,9 @@ public static class ProgressWatcher extends Res { Res watchee; JS.Callable callback; - Graft(Res watchee, JS.Callable callback) { this.watchee = watchee; this.callback = callback; } + ProgressWatcher(Res watchee, JS.Callable callback) { this.watchee = watchee; this.callback = callback; } public InputStream getInputStream(String s) throws IOException { - return new FilterInputStream(graftee.getInputStream(s)) { + /*return new FilterInputStream(graftee.getInputStream(s)) { int bytesDownloaded = 0; public int read() throws IOException { int ret = super.read(); @@ -161,9 +161,10 @@ callback.call(args); } }); } - }; + };*/ + throw new Error("ProgressWatcher is broken"); } - }); + } /** unpacks a Microsoft CAB file (possibly embedded in another file; we scan for 'MSCF' */ public static class CAB extends Res { Index: src/org/xwt/HTTP.java =================================================================== RCS file: //xwt/src/org/xwt/HTTP.java,v retrieving revision 1.41 diff -u -r1.41 HTTP.java --- src/org/xwt/HTTP.java 28 Sep 2003 20:54:51 -0000 1.41 +++ src/org/xwt/HTTP.java 29 Sep 2003 00:52:12 -0000 @@ -545,7 +545,7 @@ } return ret; } finally { - if (!good) { this.HTTP.sock = null; this.HTTP.in = null; } + if (!good) { HTTP.this.sock = null; HTTP.this.in = null; } } }