# HG changeset patch # User Jaroslav Tulach # Date 1393921457 -3600 # Node ID eff392cfe687e05ad5aa91187cd61140ddcda207 # Parent 10e6f6e098114ca920413ae6161fde8196b1fe00 Move the main initialization method into MinesModel diff -r 10e6f6e09811 -r eff392cfe687 minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java Sat Feb 22 16:35:11 2014 +0100 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java Tue Mar 04 09:24:17 2014 +0100 @@ -30,20 +30,14 @@ public final class Main { private Main() { } - + /** Launches the browser */ public static void main(String... args) throws Exception { BrowserBuilder.newBrowser(). loadPage("pages/index.html"). - loadClass(Main.class). - invoke("onPageLoad", args). + loadClass(MinesModel.class). + invoke("main", args). showAndWait(); System.exit(0); } - - /** Called when page is ready */ - public static void onPageLoad(String... args) throws Exception { - Mines m = new Mines(); - m.applyBindings(); - } } diff -r 10e6f6e09811 -r eff392cfe687 minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java Sat Feb 22 16:35:11 2014 +0100 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java Tue Mar 04 09:24:17 2014 +0100 @@ -26,7 +26,7 @@ public class MainBrwsr { static { try { - Main.onPageLoad(); + MinesModel.main(); } catch (Exception ex) { throw new IllegalStateException(ex); } diff -r 10e6f6e09811 -r eff392cfe687 minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java --- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java Sat Feb 22 16:35:11 2014 +0100 +++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java Tue Mar 04 09:24:17 2014 +0100 @@ -39,7 +39,7 @@ @Property(name = "state", type = MinesModel.GameState.class), @Property(name = "rows", type = Row.class, array = true), }) -final class MinesModel { +public final class MinesModel { enum GameState { IN_PROGRESS, WON, LOST; } @@ -274,4 +274,12 @@ } } } + + /** + * Called when page is ready + */ + public static void main(String... args) throws Exception { + Mines m = new Mines(); + m.applyBindings(); + } }