1.1 --- a/javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/mavenhtml/App.java	Fri Jan 11 16:36:28 2013 +0100
     1.2 +++ b/javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/mavenhtml/App.java	Sat Jan 12 20:24:30 2013 +0100
     1.3 @@ -17,7 +17,8 @@
     1.4   */
     1.5  package org.apidesign.bck2brwsr.mavenhtml;
     1.6  
     1.7 -import org.apidesign.bck2brwsr.htmlpage.api.OnClick;
     1.8 +import org.apidesign.bck2brwsr.htmlpage.api.On;
     1.9 +import static org.apidesign.bck2brwsr.htmlpage.api.OnEvent.*;
    1.10  import org.apidesign.bck2brwsr.htmlpage.api.Page;
    1.11  
    1.12  /** HTML5 & Java demo showing the power of 
    1.13 @@ -31,21 +32,21 @@
    1.14      private static double memory;
    1.15      private static String operation;
    1.16      
    1.17 -    @OnClick(id="clear")
    1.18 +    @On(event = CLICK, id="clear")
    1.19      static void clear() {
    1.20          memory = 0;
    1.21          operation = null;
    1.22          Calculator.DISPLAY.setValue("0");
    1.23      }
    1.24      
    1.25 -    @OnClick(id= { "plus", "minus", "mul", "div" })
    1.26 +    @On(event = CLICK, id= { "plus", "minus", "mul", "div" })
    1.27      static void applyOp(String op) {
    1.28          memory = getValue();
    1.29          operation = op;
    1.30          Calculator.DISPLAY.setValue("0");
    1.31      }
    1.32      
    1.33 -    @OnClick(id="result")
    1.34 +    @On(event = CLICK, id="result")
    1.35      static void computeTheValue() {
    1.36          switch (operation) {
    1.37              case "plus": setValue(memory + getValue()); break;
    1.38 @@ -56,7 +57,7 @@
    1.39          }
    1.40      }
    1.41      
    1.42 -    @OnClick(id={"n0", "n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9"}) 
    1.43 +    @On(event = CLICK, id={"n0", "n1", "n2", "n3", "n4", "n5", "n6", "n7", "n8", "n9"}) 
    1.44      static void addDigit(String digit) {
    1.45          digit = digit.substring(1);
    1.46          String v = Calculator.DISPLAY.getValue();