[re]-merged in Brians stuff

[org.ibex.js.git] / src / org / ibex / js / Fountain.java

diff --git a/src/org/ibex/js/Fountain.java b/src/org/ibex/js/Fountain.java
index 264f2ff..acf617a 100644 (file)
--- a/src/org/ibex/js/Fountain.java
+++ b/src/org/ibex/js/Fountain.java
@@ -12,7 +12,7 @@ import org.ibex.net.*;
  *   be totally independent of the others (ie separate stream position
  *   and state) although they draw from the same data source.
  */
-public abstract class Fountain extends JS.Cloneable {
+public abstract class Fountain extends JS.O implements JS.Cloneable {
 
     // Public Interface //////////////////////////////////////////////////////////////////////////////
 
@@ -37,7 +37,7 @@ public abstract class Fountain extends JS.Cloneable {
     /** HTTP or HTTPS resource */
     public static class HTTP extends Fountain {
         private String url;
-        public String toString() { return "Stream.HTTP:" + url; }
+        //public String toString() { return "Stream.HTTP:" + url; }
         public HTTP(String url) { while (url.endsWith("/")) url = url.substring(0, url.length() - 1); this.url = url; }
         public Object _get(Object key) { return new HTTP(url + "/" + (String)key); }
         public String getCacheKey(Vec path) throws NotCacheableException { return url; }
@@ -58,7 +58,7 @@ public abstract class Fountain extends JS.Cloneable {
     public static class File extends Fountain {
         private String path;
         public File(String path) { this.path = path; }
-        public String toString() { return "file:" + path; }
+        //public String toString() { return "file:" + path; }
         public String getCacheKey() throws NotCacheableException { throw new NotCacheableException(); /* already on disk */ }
         public InputStream getInputStream() throws IOException { return new FileInputStream(path); }
         public Object _get(Object key) { return new File(path + java.io.File.separatorChar + (String)key); }