public static java.net.InetAddress originAddr = null;
public static String originHost = null;
public static String origin = null;
+ public static String initialTemplate = null;
public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
public static Picture scarImage = null;
System.err.println("");
System.err.println("Options:");
System.err.println(" -v verbose logging");
+ System.err.println(" -s [not yet supported]");
+ System.err.println(" -l [not yet supported]");
System.err.println("");
System.err.println("Source-location is one of the following:");
System.err.println(" - the path to an xwar file");
System.err.println(" - the path to a directory to be used as an xwar");
System.err.println(" - the http url of an xwar");
System.err.println("");
- System.err.println("Initial-template is the resource name of the template to load; defaults to 'main'");
+ System.err.println("Initial-template is the path of the template to load; defaults to 'main'");
Runtime.getRuntime().exit(-1);
}
Platform.forceLoad();
if (Log.on) for(int i=0; i<args.length; i++) Log.info(Main.class, "argument " + i + ": " + args[i]);
- String initialTemplateName = args.length > startargs + 1 ? args[startargs + 1] : "main";
- initialTemplateName = initialTemplateName.replace('.', '/');
- initialTemplateName += ".xwt";
+ initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";
origin = args[startargs];
Stream rr;
- final String initialTemplate;
-
+ final String startupTemplate;
if (origin.startsWith("http://") || origin.startsWith("https://")) {
originHost = origin.substring(origin.indexOf('/') + 2);
originHost = originHost.substring(0, originHost.indexOf('/') == -1 ? originHost.length() : originHost.indexOf('/'));
if (originHost.indexOf('@') != -1) originHost = originHost.substring(originHost.indexOf('@') + 1);
originAddr = InetAddress.getByName(originHost);
rr = builtin;
- initialTemplate = "org/xwt/builtin/splash.xwt";
+ startupTemplate = "org.xwt.builtin.splash";
} else {
rr = new Stream.File(origin);
if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
- initialTemplate = initialTemplateName;
+ startupTemplate = initialTemplate;
}
if (Log.on) Log.info(Main.class, "loading xwar");
scarImage =
Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
new Scheduler.Task() { public void perform() throws Exception {
- new Template(Stream.getInputStream(final_rr.get(initialTemplate)), xwt).apply(new Box());
+ new Template(Stream.getInputStream(xwt.resolveStringToResource(startupTemplate, false)), xwt).apply(new Box());
} });
Scheduler.init();