javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java
1.1 --- a/javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java Mon Feb 18 19:42:02 2013 +0100
1.2 +++ b/javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java Fri Mar 22 17:03:32 2013 +0100
1.3 @@ -50,18 +50,18 @@
1.4 }
1.5
1.6 @On(event = CLICK, id= { "plus", "minus", "mul", "div" })
1.7 - static void applyOp(Calculator c, String op) {
1.8 + static void applyOp(Calculator c, String id) {
1.9 c.setMemory(c.getDisplay());
1.10 - c.setOperation(op);
1.11 + c.setOperation(id);
1.12 c.setDisplay(0);
1.13 }
1.14
1.15 @On(event = MOUSE_OVER, id= { "result" })
1.16 - static void attemptingIn(Calculator c, String op) {
1.17 + static void attemptingIn(Calculator c) {
1.18 c.setHover(true);
1.19 }
1.20 @On(event = MOUSE_OUT, id= { "result" })
1.21 - static void attemptingOut(Calculator c, String op) {
1.22 + static void attemptingOut(Calculator c) {
1.23 c.setHover(false);
1.24 }
1.25
1.26 @@ -88,18 +88,18 @@
1.27 }
1.28
1.29 @On(event = CLICK, id={"n0", "n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9"})
1.30 - static void addDigit(String digit, Calculator c) {
1.31 - digit = digit.substring(1);
1.32 + static void addDigit(String id, Calculator c) {
1.33 + id = id.substring(1);
1.34
1.35 double v = c.getDisplay();
1.36 if (v == 0.0) {
1.37 - c.setDisplay(Integer.parseInt(digit));
1.38 + c.setDisplay(Integer.parseInt(id));
1.39 } else {
1.40 String txt = Double.toString(v);
1.41 if (txt.endsWith(".0")) {
1.42 txt = txt.substring(0, txt.length() - 2);
1.43 }
1.44 - txt = txt + digit;
1.45 + txt = txt + id;
1.46 c.setDisplay(Double.parseDouble(txt));
1.47 }
1.48 }