projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
licensing cleanup (GPLv2)
[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
528b0d7
..
3c9b22c
100644
(file)
--- a/
src/org/ibex/graphics/Picture.java
+++ b/
src/org/ibex/graphics/Picture.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 GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
package org.ibex.graphics;
import java.io.*;
import org.ibex.js.*;
package org.ibex.graphics;
import java.io.*;
import org.ibex.js.*;
@@
-32,15
+35,21
@@
public class Picture {
/** turns a stream into a Picture.Source and passes it to the callback */
public static Picture load(final JS stream, final Task callback) {
/** turns a stream into a Picture.Source and passes it to the callback */
public static Picture load(final JS stream, final Task callback) {
+ if(stream == null) throw new NullPointerException();
Picture ret = (Picture)cache.get(stream);
Picture ret = (Picture)cache.get(stream);
- if (ret == null) cache.put(stream, ret = Platform.createPicture(stream));
+ if (ret == null) {
+ ret = Platform.createPicture(stream);
+ if(ret == null) throw new NullPointerException();
+ cache.put(stream, ret);
+ }
final Picture p = ret;
if (!ret.isLoaded && callback != null) {
final Picture p = ret;
if (!ret.isLoaded && callback != null) {
+ // FEATURE: This is kind of ugly - shouldn't need a blessing
final Ibex.Blessing b = Ibex.Blessing.getBlessing(stream);
new java.lang.Thread() { public void run() {
InputStream in = null;
try {
final Ibex.Blessing b = Ibex.Blessing.getBlessing(stream);
new java.lang.Thread() { public void run() {
InputStream in = null;
try {
- in = b == null ? Stream.getInputStream(stream) : b.getImage();
+ in = b == null ? stream.getInputStream() : b.getImage();
} catch (IOException e) { Log.error(Picture.class, e);
} catch (JSExn e) { Log.error(Picture.class, e);
}
} catch (IOException e) { Log.error(Picture.class, e);
} catch (JSExn e) { Log.error(Picture.class, e);
}