projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make core compile with new js stuff and Task replacement class
[org.ibex.core.git]
/
src
/
org
/
ibex
/
graphics
/
Picture.java
diff --git
a/src/org/ibex/graphics/Picture.java
b/src/org/ibex/graphics/Picture.java
index
3c9b22c
..
0a92677
100644
(file)
--- a/
src/org/ibex/graphics/Picture.java
+++ b/
src/org/ibex/graphics/Picture.java
@@
-22,7
+22,7
@@
public class Picture {
public Picture() { this.stream = null; }
public Picture(JS r) { this.stream = r; }
public Picture() { this.stream = null; }
public Picture(JS r) { this.stream = r; }
- private static Cache cache = new Cache(100); ///< Picture, keyed by the Stream that loaded them
+ private static Cache cache = new Cache(100, true); ///< Picture, keyed by the Stream that loaded them
public JS stream = null; ///< the stream we were loaded from
public int width = -1; ///< the width of the image
public JS stream = null; ///< the stream we were loaded from
public int width = -1; ///< the width of the image
@@
-34,7
+34,7
@@
public class Picture {
protected void loaded() { isLoaded = true; }
/** turns a stream into a Picture.Source and passes it to the callback */
protected void loaded() { isLoaded = true; }
/** turns a stream into a Picture.Source and passes it to the callback */
- public static Picture load(final JS stream, final Task callback) {
+ public static Picture load(final JS stream, final Callable callback) {
if(stream == null) throw new NullPointerException();
Picture ret = (Picture)cache.get(stream);
if (ret == null) {
if(stream == null) throw new NullPointerException();
Picture ret = (Picture)cache.get(stream);
if (ret == null) {