1.1 --- a/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/FXBrwsr.java Thu Mar 14 09:22:28 2013 +0100
1.2 +++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/impl/FXBrwsr.java Wed Mar 20 06:56:44 2013 +0100
1.3 @@ -111,6 +111,10 @@
1.4 eng.setOnAlert(new EventHandler<WebEvent<String>>() {
1.5 @Override
1.6 public void handle(WebEvent<String> t) {
1.7 + if ("bck2brwsr".equals(t.getData())) {
1.8 + initBck2Brwsr(eng);
1.9 + return;
1.10 + }
1.11 JOptionPane.showMessageDialog(null, t.getData());
1.12 }
1.13 });
1.14 @@ -128,25 +132,10 @@
1.15 void initBck2Brwsr(WebEngine webEngine) {
1.16 JSObject jsobj = (JSObject) webEngine.executeScript("window");
1.17 LOG.info("window: " + jsobj);
1.18 - System.getProperties().put("webEngine", webEngine);
1.19 - Object prev = jsobj.getMember("jvmBridge");
1.20 - if (prev instanceof JSObject) {
1.21 - jsobj.setMember("jvmBridge", bridge);
1.22 - JSObject jso = (JSObject) prev;
1.23 - Object len = jso.getMember("length");
1.24 - if (len instanceof Integer) {
1.25 - for (int i = 0; i < (Integer) len; i++) {
1.26 - Object slt = jso.getSlot(i);
1.27 - if (slt instanceof String) {
1.28 - try {
1.29 - bridge.loadClass((String) slt);
1.30 - } catch (ClassNotFoundException ex) {
1.31 - LOG.log(Level.SEVERE, null, ex);
1.32 - }
1.33 - }
1.34 - }
1.35 - LOG.info("bck2brwsr: " + jsobj.getMember("bck2brwsr"));
1.36 - }
1.37 + Object prev = jsobj.getMember("bck2brwsr");
1.38 + if ("undefined".equals(prev)) {
1.39 + System.getProperties().put("webEngine", webEngine);
1.40 + jsobj.setMember("bck2brwsr", bridge);
1.41 }
1.42 }
1.43