improvements to Doc.java, corresponding fixes to the reference

[org.ibex.core.git] / src / org / ibex / Stream.java

diff --git a/src/org/ibex/Stream.java b/src/org/ibex/Stream.java
index d200ce0..a7a3bb8 100644 (file)
--- a/src/org/ibex/Stream.java
+++ b/src/org/ibex/Stream.java
@@ -5,7 +5,7 @@ import java.io.*;
 import java.util.zip.*;
 import org.ibex.js.*;
 import org.ibex.util.*;
-import org.xwt.translators.MSPack;
+import org.ibex.translators.MSPack;
 
 /**
  *   Essentiall an InputStream "factory".  You can repeatedly ask a
@@ -94,7 +94,6 @@ public abstract class Stream extends JS.Cloneable {
 
     /** the Builtin resource */
     public static class Builtin extends Stream {
-        public Builtin() { };
         public String getCacheKey() throws NotCacheableException { throw new NotCacheableException(); }
         public InputStream getInputStream() throws IOException { return Platform.getBuiltinInputStream(); }
     }
@@ -117,7 +116,7 @@ public abstract class Stream extends JS.Cloneable {
                     public int read(byte[] b, int off, int len) throws IOException {
                         int ret = super.read(b, off, len);
                         if (ret != 1) bytesDownloaded += ret;
-                        Scheduler.add(new Scheduler.Task() { public void perform() throws Exception {
+                        Scheduler.add(new Scheduler.Task() { public void perform() throws IOException, JSExn {
                             callback.call(N(bytesDownloaded),
                                           N(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0), null, null, 2);
                         } });