projects
/
org.ibex.js.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug related to removal of JS.call(JS[])
[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
..
f1bf14b
100644
(file)
--- a/
src/org/ibex/js/Fountain.java
+++ b/
src/org/ibex/js/Fountain.java
@@
-1,4
+1,7
@@
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
package org.ibex.js;
import java.io.*;
package org.ibex.js;
import java.io.*;
@@
-12,7
+15,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.
*/
* 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.Immutable implements JS.Cloneable {
// Public Interface //////////////////////////////////////////////////////////////////////////////
// Public Interface //////////////////////////////////////////////////////////////////////////////
@@
-20,8
+23,7
@@
public abstract class Fountain extends JS.Cloneable {
public static class NotCacheableException extends Exception { }
// streams are "sealed" by default to prevent accidental object leakage
public static class NotCacheableException extends Exception { }
// streams are "sealed" by default to prevent accidental object leakage
- public void put(Object key, Object val) { }
- private Cache getCache = new Cache(100);
+ private Cache getCache = new Cache(100, true);
protected Object _get(Object key) { return null; }
public final Object get(Object key) {
Object ret = getCache.get(key);
protected Object _get(Object key) { return null; }
public final Object get(Object key) {
Object ret = getCache.get(key);
@@
-37,10
+39,10
@@
public abstract class Fountain extends JS.Cloneable {
/** HTTP or HTTPS resource */
public static class HTTP extends Fountain {
private String url;
/** 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 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; }
+ public String getCacheKey(Basket.List path) throws NotCacheableException { return url; }
public InputStream getInputStream() throws IOException { return new org.ibex.net.HTTP(url).GET(null, null); }
}
public InputStream getInputStream() throws IOException { return new org.ibex.net.HTTP(url).GET(null, null); }
}
@@
-58,7
+60,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 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); }
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); }