Move the main initialization method into MinesModel teavm
authorJaroslav Tulach <jtulach@netbeans.org>
Tue, 04 Mar 2014 09:24:17 +0100
branchteavm
changeset 90eff392cfe687
parent 88 10e6f6e09811
child 91 c20135305ad2
Move the main initialization method into MinesModel
minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java
minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java
minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java
     1.1 --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Sat Feb 22 16:35:11 2014 +0100
     1.2 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Tue Mar 04 09:24:17 2014 +0100
     1.3 @@ -30,20 +30,14 @@
     1.4  public final class Main {
     1.5      private Main() {
     1.6      }
     1.7 -    
     1.8 +
     1.9      /** Launches the browser */
    1.10      public static void main(String... args) throws Exception {
    1.11          BrowserBuilder.newBrowser().
    1.12              loadPage("pages/index.html").
    1.13 -            loadClass(Main.class).
    1.14 -            invoke("onPageLoad", args).
    1.15 +            loadClass(MinesModel.class).
    1.16 +            invoke("main", args).
    1.17              showAndWait();
    1.18          System.exit(0);
    1.19      }
    1.20 -    
    1.21 -    /** Called when page is ready */
    1.22 -    public static void onPageLoad(String... args) throws Exception {
    1.23 -        Mines m = new Mines();
    1.24 -        m.applyBindings();
    1.25 -    }
    1.26  }
     2.1 --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Sat Feb 22 16:35:11 2014 +0100
     2.2 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Tue Mar 04 09:24:17 2014 +0100
     2.3 @@ -26,7 +26,7 @@
     2.4  public class MainBrwsr {
     2.5      static {
     2.6          try {
     2.7 -            Main.onPageLoad();
     2.8 +            MinesModel.main();
     2.9          } catch (Exception ex) {
    2.10              throw new IllegalStateException(ex);
    2.11          }
     3.1 --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Sat Feb 22 16:35:11 2014 +0100
     3.2 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Tue Mar 04 09:24:17 2014 +0100
     3.3 @@ -39,7 +39,7 @@
     3.4      @Property(name = "state", type = MinesModel.GameState.class),
     3.5      @Property(name = "rows", type = Row.class, array = true),
     3.6  })
     3.7 -final class MinesModel {
     3.8 +public final class MinesModel {
     3.9      enum GameState {
    3.10          IN_PROGRESS, WON, LOST;
    3.11      }
    3.12 @@ -274,4 +274,12 @@
    3.13              }
    3.14          }
    3.15      }
    3.16 +    
    3.17 +    /**
    3.18 +     * Called when page is ready
    3.19 +     */
    3.20 +    public static void main(String... args) throws Exception {
    3.21 +        Mines m = new Mines();
    3.22 +        m.applyBindings();
    3.23 +    }
    3.24  }