projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f22d1a
)
2002/08/07 04:43:31
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:46 +0000
(06:49 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:46 +0000
(06:49 +0000)
darcs-hash:
20040130064946
-2ba56-
601df5f619a002471236c9ffaaf08521efb3f39f
.gz
CHANGES
patch
|
blob
|
history
src/org/xwt/Box.java
patch
|
blob
|
history
diff --git
a/CHANGES
b/CHANGES
index
742608c
..
1fe0a9f
100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-343,3
+343,5
@@
06-Jul megacz POSIX.java: font mapper now prefers ISO_8559-1 fonts
06-Jul megacz POSIX.java: font mapper now prefers ISO_8559-1 fonts
+06-Jul megacz Box.java: use new HTTP interface, getIds() only returns children
+
diff --git
a/src/org/xwt/Box.java
b/src/org/xwt/Box.java
index
c60552c
..
f89e998
100644
(file)
--- a/
src/org/xwt/Box.java
+++ b/
src/org/xwt/Box.java
@@
-438,9
+438,10
@@
public final class Box extends JSObject {
if (str.endsWith(".jpeg") || str.endsWith(".jpg"))
str = "http://xmlrpc.xwt.org/jpeg2png/" + str.substring(str.indexOf("//") + 2);
if (str.endsWith(".jpeg") || str.endsWith(".jpg"))
str = "http://xmlrpc.xwt.org/jpeg2png/" + str.substring(str.indexOf("//") + 2);
- final HTTP http = new HTTP(str);
- final int contentLength = http.getContentLength();
- InputStream is = new FilterInputStream(http.getInputStream()) {
+ HTTP http = new HTTP(str);
+ final HTTP.HTTPInputStream in = http.GET();
+ final int contentLength = in.getContentLength();
+ InputStream is = new FilterInputStream(in) {
int bytesDownloaded = 0;
boolean clear = true;
public int read() throws IOException {
int bytesDownloaded = 0;
boolean clear = true;
public int read() throws IOException {
@@
-467,10
+468,9
@@
public final class Box extends JSObject {
return ret;
}
};
return ret;
}
};
-
- if (str.endsWith(".gif")) ret = GIF.decode(is, str);
- else ret = PNG.decode(is, str);
- return ret;
+
+ if (str.endsWith(".gif")) return GIF.decode(is, str);
+ else return PNG.decode(is, str);
} catch (IOException e) {
if (Log.on) Log.log(Box.class, "error while trying to load an image from " + str);
} catch (IOException e) {
if (Log.on) Log.log(Box.class, "error while trying to load an image from " + str);
@@
-1201,6
+1201,12
@@
public final class Box extends JSObject {
return super.has(name, start);
}
return super.has(name, start);
}
+ public Object[] getIds() {
+ Object[] ret = new Object[numChildren()];
+ for(int i=0; i<ret.length; i++) ret[i] = get(i, null);
+ return ret;
+ }
+
public void put(String name, Scriptable start, Object value) { put(name, start, value, false, null); }
public void put(String name, Scriptable start, Object value, boolean ignoretraps) { put(name, start, value, ignoretraps, null); }
public void put(String name, Scriptable start, Object value) { put(name, start, value, false, null); }
public void put(String name, Scriptable start, Object value, boolean ignoretraps) { put(name, start, value, ignoretraps, null); }