projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003/12/29 22:29:29
[org.ibex.core.git]
/
src
/
org
/
xwt
/
Main.java
diff --git
a/src/org/xwt/Main.java
b/src/org/xwt/Main.java
index
179ffab
..
23d48ce
100644
(file)
--- a/
src/org/xwt/Main.java
+++ b/
src/org/xwt/Main.java
@@
-25,7
+25,7
@@
public class Main {
public static String originHost = null;
public static String origin = null;
public static String originHost = null;
public static String origin = null;
- public static final Res builtin = new Res.Zip(new Res.Builtin());
+ public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
public static Picture scarImage = null;
public static void printUsage() {
public static Picture scarImage = null;
public static void printUsage() {
@@
-59,7
+59,7
@@
public class Main {
initialTemplateName = initialTemplateName.replace('.', '/');
origin = args[startargs];
initialTemplateName = initialTemplateName.replace('.', '/');
origin = args[startargs];
- Res rr;
+ Stream rr;
final String initialTemplate;
if (origin.startsWith("http://") || origin.startsWith("https://")) {
final String initialTemplate;
if (origin.startsWith("http://") || origin.startsWith("https://")) {
@@
-70,19
+70,19
@@
public class Main {
rr = builtin;
initialTemplate = "org/xwt/builtin/splash.xwt";
} else {
rr = builtin;
initialTemplate = "org/xwt/builtin/splash.xwt";
} else {
- rr = new Res.File(origin);
- if (!new File(origin).isDirectory()) rr = new Res.Zip(rr);
+ rr = new Stream.File(origin);
+ if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
initialTemplate = initialTemplateName;
}
if (Log.on) Log.info(Main.class, "loading xwar");
final XWT xwt = new XWT(rr);
initialTemplate = initialTemplateName;
}
if (Log.on) Log.info(Main.class, "loading xwar");
final XWT xwt = new XWT(rr);
- final Res final_rr = rr;
+ final Stream final_rr = rr;
scarImage =
scarImage =
- Picture.load((Res)Main.builtin.get("org/xwt/builtin/scar.png"),
+ Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
new Scheduler.Task() { public void perform() throws JSExn {
new Scheduler.Task() { public void perform() throws JSExn {
- Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), xwt);
+ Template.getTemplate(((Stream)final_rr.get(initialTemplate))).apply(new Box(), xwt);
} });
Scheduler.init();
} });
Scheduler.init();