1.1 --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Sun Mar 09 15:21:42 2014 +0100
     1.2 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Mon Mar 10 12:56:48 2014 +0100
     1.3 @@ -30,7 +30,7 @@
     1.4  import java.util.logging.Level;
     1.5  import java.util.logging.Logger;
     1.6  import net.java.html.boot.BrowserBuilder;
     1.7 -import org.apidesign.html.dlvkbrwsr.XtrnlBrwsrPrsntr;
     1.8 +import org.apidesign.html.brwsr.XtrnlBrwsrPrsntr;
     1.9  
    1.10  
    1.11  /** Bootstrap and initialization. */
    1.12 @@ -38,38 +38,11 @@
    1.13      private static final Logger LOG = Logger.getLogger(Main.class.getName());
    1.14      private Main() {
    1.15      }
    1.16 -
    1.17 -    static Object[] showBrwsr(URI uri, String cmd) throws IOException {
    1.18 -        LOG.log(Level.INFO, "Showing {0}", uri);
    1.19 -        if (cmd == null) {
    1.20 -            try {
    1.21 -                LOG.log(Level.INFO, "Trying Desktop.browse on {0} {2} by {1}", new Object[]{
    1.22 -                    System.getProperty("java.vm.name"),
    1.23 -                    System.getProperty("java.vm.vendor"),
    1.24 -                    System.getProperty("java.vm.version"),});
    1.25 -                java.awt.Desktop.getDesktop().browse(uri);
    1.26 -                LOG.log(Level.INFO, "Desktop.browse successfully finished");
    1.27 -                return null;
    1.28 -            } catch (UnsupportedOperationException ex) {
    1.29 -                LOG.log(Level.INFO, "Desktop.browse not supported: {0}", ex.getMessage());
    1.30 -                LOG.log(Level.FINE, null, ex);
    1.31 -            }
    1.32 -        }
    1.33 -        {
    1.34 -            String cmdName = cmd == null ? "xdg-open" : cmd;
    1.35 -            String[] cmdArr = {
    1.36 -                cmdName, uri.toString()
    1.37 -            };
    1.38 -            LOG.log(Level.INFO, "Launching {0}", Arrays.toString(cmdArr));
    1.39 -            final Process process = Runtime.getRuntime().exec(cmdArr);
    1.40 -            return new Object[]{process, null};
    1.41 -        }
    1.42 -    }
    1.43      
    1.44 -    /** Launches the browser */
    1.45 -    public static void main(String... args) throws Exception {
    1.46 +    /** Called when page is ready */
    1.47 +    public static void onPageLoad(String... args) throws Exception {
    1.48          /*
    1.49 -        Logger l = Logger.getLogger("org.apidesign.html.dlvkbrwsr");
    1.50 +        Logger l = Logger.getLogger("org.apidesign.html.brwsr");
    1.51          l.setLevel(Level.ALL);
    1.52          l.setUseParentHandlers(false);
    1.53          ConsoleHandler ch = new ConsoleHandler();
    1.54 @@ -77,23 +50,6 @@
    1.55          l.addHandler(ch);
    1.56          */
    1.57          
    1.58 -        
    1.59 -        BrowserBuilder.newBrowser(new XtrnlBrwsrPrsntr() {
    1.60 -            @Override
    1.61 -            protected void showBrwsr(URI page) throws IOException {
    1.62 -                Main.showBrwsr(page, null);
    1.63 -            }
    1.64 -        }).
    1.65 -            loadPage("pages/index.html").
    1.66 -            loadClass(Main.class).
    1.67 -            invoke("onPageLoad", args).
    1.68 -            showAndWait();
    1.69 -        System.in.read();
    1.70 -        System.exit(0);
    1.71 -    }
    1.72 -    
    1.73 -    /** Called when page is ready */
    1.74 -    public static void onPageLoad(String... args) throws Exception {
    1.75          Mines m = new Mines();
    1.76          m.applyBindings();
    1.77      }