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:
59ee964
)
2003/02/12 06:40:22
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:51:25 +0000
(06:51 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:51:25 +0000
(06:51 +0000)
darcs-hash:
20040130065125
-2ba56-
fe8e64026bb37fcc01e7190f20330b324f1d56bb
.gz
CHANGES
patch
|
blob
|
history
src/org/xwt/Resources.java
patch
|
blob
|
history
diff --git
a/CHANGES
b/CHANGES
index
7431d53
..
a6e3563
100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-468,3
+468,7
@@
11-Feb megacz PNG.java: changed System.out.println to Log.log
11-Feb megacz PNG.java: changed System.out.println to Log.log
+11-Feb megacz splash.xwt: added "press Esc to quit" message
+
+11-Feb megacz Resources.java: removed libgcj hack; 3.3 fixed the problem
+
diff --git
a/src/org/xwt/Resources.java
b/src/org/xwt/Resources.java
index
52e0980
..
1996501
100644
(file)
--- a/
src/org/xwt/Resources.java
+++ b/
src/org/xwt/Resources.java
@@
-83,17
+83,7
@@
public class Resources {
return super.read();
}
public int read(byte[] b, int off, int len) throws IOException {
return super.read();
}
public int read(byte[] b, int off, int len) throws IOException {
- int ret = 0;
-
- // Ugly hack to work around libgcj zlib bug -- always try to fill the buffer completely
- while (len > 0) {
- int read = super.read(b, off, len);
- if (read == -1) break;
- ret += read;
- len -= read;
- off += read;
- }
-
+ int ret = super.read(b, off, len);
if (clear && callback != null) {
clear = false;
ThreadMessage.newthread(new JSObject.JSFunction() {
if (clear && callback != null) {
clear = false;
ThreadMessage.newthread(new JSObject.JSFunction() {
@@
-107,7
+97,6
@@
public class Resources {
}
});
}
}
});
}
-
bytesDownloaded += ret;
return ret;
}
bytesDownloaded += ret;
return ret;
}
@@
-115,7
+104,6
@@
public class Resources {
for(ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry()) {
String name = ze.getName();
for(ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry()) {
String name = ze.getName();
- if (Log.on) Log.log(Resources.class, name);
if (!validResourceName(name.substring(name.lastIndexOf('/') + 1))) {
if (Log.on) Log.log(Resources.class, "WARNING: ignoring xwar entry with invalid name: " + name);
continue;
if (!validResourceName(name.substring(name.lastIndexOf('/') + 1))) {
if (Log.on) Log.log(Resources.class, "WARNING: ignoring xwar entry with invalid name: " + name);
continue;