# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1364233010 -3600
# Node ID 63c6bddd814ef53bfb79d4f183fd1cf43c47d927
# Parent  8c14a9f0c232c6f6f1f5529e4d2f7c4c32cfd6ec# Parent  c8810910c311f590c126e58df9ad1ada721c821d
Merging the array/complex type knockout mapping into default branch for version 0.5

diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/pom.xml
--- a/javaquery/api/pom.xml	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/api/pom.xml	Mon Mar 25 18:36:50 2013 +0100
@@ -18,8 +18,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java	Mon Mar 25 18:36:50 2013 +0100
@@ -43,7 +43,8 @@
     }
     
     @JavaScriptBody(args = { "object", "property" },
-        body = "var p = object[property]; return p ? p : null;"
+        body = "if (property === null) return object;\n"
+        + "var p = object[property]; return p ? p : null;"
     )
     private static Object getProperty(Object object, String property) {
         return null;
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/KOList.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/KOList.java	Mon Mar 25 18:36:50 2013 +0100
@@ -0,0 +1,113 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apidesign.bck2brwsr.core.JavaScriptOnly;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public final class KOList<T> extends ArrayList<T> {
+    private final String name;
+    private final String[] deps;
+    private Knockout model;
+
+    public KOList(String name, String... deps) {
+        this.name = name;
+        this.deps = deps;
+    }
+    
+    public void assign(Knockout model) {
+        this.model = model;
+    }
+
+    @Override
+    public boolean add(T e) {
+        boolean ret = super.add(e);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        boolean ret = super.remove(o);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public void clear() {
+        super.clear();
+        notifyChange();
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        boolean ret = super.removeAll(c);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        boolean ret = super.retainAll(c);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public T set(int index, T element) {
+        T ret = super.set(index, element);
+        notifyChange();
+        return ret;
+    }
+
+    @Override
+    public void add(int index, T element) {
+        super.add(index, element);
+        notifyChange();
+    }
+
+    @Override
+    public T remove(int index) {
+        T ret = super.remove(index);
+        notifyChange();
+        return ret;
+    }
+    
+    
+    
+    @JavaScriptOnly(name = "koArray", value = "function() { return this.toArray___3Ljava_lang_Object_2(); }")
+    private static native int koArray();
+
+    private void notifyChange() {
+        Knockout m = model;
+        if (m == null) {
+            return;
+        }
+        m.valueHasMutated(name);
+        for (String dependant : deps) {
+            m.valueHasMutated(dependant);
+        }
+    }
+    
+    
+}
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Knockout.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Knockout.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Knockout.java	Mon Mar 25 18:36:50 2013 +0100
@@ -18,6 +18,7 @@
 package org.apidesign.bck2brwsr.htmlpage;
 
 import java.lang.reflect.Method;
+import java.util.List;
 import org.apidesign.bck2brwsr.core.ExtraJavaScript;
 import org.apidesign.bck2brwsr.core.JavaScriptBody;
 
@@ -29,12 +30,13 @@
 public class Knockout {
     /** used by tests */
     static Knockout next;
-    
+
     Knockout() {
     }
     
     public static <M> Knockout applyBindings(
-        Class<M> modelClass, M model, String[] propsGettersAndSetters
+        Class<M> modelClass, M model, String[] propsGettersAndSetters,
+        String[] methodsAndSignatures
     ) {
         Knockout bindings = next;
         next = null;
@@ -47,12 +49,18 @@
                 bind(bindings, model, propsGettersAndSetters[i],
                     propsGettersAndSetters[i + 1],
                     propsGettersAndSetters[i + 2],
-                    getter.getReturnType().isPrimitive()
+                    getter.getReturnType().isPrimitive(),
+                    List.class.isAssignableFrom(getter.getReturnType())
                 );
             } catch (NoSuchMethodException ex) {
                 throw new IllegalStateException(ex.getMessage());
             }
         }
+        for (int i = 0; i < methodsAndSignatures.length; i += 2) {
+            expose(
+                bindings, model, methodsAndSignatures[i], methodsAndSignatures[i + 1]
+            );
+        }
         applyBindings(bindings);
         return bindings;
     }
@@ -68,10 +76,11 @@
     public static void triggerEvent(String id, String ev) {
     }
     
-    @JavaScriptBody(args = { "bindings", "model", "prop", "getter", "setter", "primitive" }, body =
+    @JavaScriptBody(args = { "bindings", "model", "prop", "getter", "setter", "primitive", "array" }, body =
           "var bnd = {\n"
         + "  'read': function() {\n"
         + "    var v = model[getter]();\n"
+        + "    if (array) v = v.koArray();\n"
         + "    return v;\n"
         + "  },\n"
         + "  'owner': bindings\n"
@@ -84,7 +93,15 @@
         + "bindings[prop] = ko['computed'](bnd);"
     )
     private static void bind(
-        Object bindings, Object model, String prop, String getter, String setter, boolean primitive
+        Object bindings, Object model, String prop, String getter, String setter, boolean primitive, boolean array
+    ) {
+    }
+
+    @JavaScriptBody(args = { "bindings", "model", "prop", "sig" }, body = 
+        "bindings[prop] = function(data, ev) { model[sig](data, ev); };"
+    )
+    private static void expose(
+        Object bindings, Object model, String prop, String sig
     ) {
     }
     
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Mon Mar 25 18:36:50 2013 +0100
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -47,11 +48,14 @@
 import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
+import org.apidesign.bck2brwsr.htmlpage.api.Model;
 import org.apidesign.bck2brwsr.htmlpage.api.On;
+import org.apidesign.bck2brwsr.htmlpage.api.OnFunction;
 import org.apidesign.bck2brwsr.htmlpage.api.Page;
 import org.apidesign.bck2brwsr.htmlpage.api.Property;
 import org.openide.util.lookup.ServiceProvider;
@@ -63,89 +67,26 @@
  */
 @ServiceProvider(service=Processor.class)
 @SupportedAnnotationTypes({
+    "org.apidesign.bck2brwsr.htmlpage.api.Model",
     "org.apidesign.bck2brwsr.htmlpage.api.Page",
+    "org.apidesign.bck2brwsr.htmlpage.api.OnFunction",
     "org.apidesign.bck2brwsr.htmlpage.api.On"
 })
 public final class PageProcessor extends AbstractProcessor {
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        for (Element e : roundEnv.getElementsAnnotatedWith(Page.class)) {
-            Page p = e.getAnnotation(Page.class);
-            if (p == null) {
-                continue;
-            }
-            PackageElement pe = (PackageElement)e.getEnclosingElement();
-            String pkg = pe.getQualifiedName().toString();
-            
-            ProcessPage pp;
-            try {
-                InputStream is = openStream(pkg, p.xhtml());
-                pp = ProcessPage.readPage(is);
-                is.close();
-            } catch (IOException iOException) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Can't read " + p.xhtml(), e);
-                return false;
-            }
-            Writer w;
-            String className = p.className();
-            if (className.isEmpty()) {
-                int indx = p.xhtml().indexOf('.');
-                className = p.xhtml().substring(0, indx);
-            }
-            try {
-                FileObject java = processingEnv.getFiler().createSourceFile(pkg + '.' + className, e);
-                w = new OutputStreamWriter(java.openOutputStream());
-                try {
-                    w.append("package " + pkg + ";\n");
-                    w.append("import org.apidesign.bck2brwsr.htmlpage.api.*;\n");
-                    w.append("final class ").append(className).append(" {\n");
-                    w.append("  private boolean locked;\n");
-                    if (!initializeOnClick(className, (TypeElement) e, w, pp)) {
-                        return false;
-                    }
-                    for (String id : pp.ids()) {
-                        String tag = pp.tagNameForId(id);
-                        String type = type(tag);
-                        w.append("  ").append("public final ").
-                            append(type).append(' ').append(cnstnt(id)).append(" = new ").
-                            append(type).append("(\"").append(id).append("\");\n");
-                    }
-                    List<String> propsGetSet = new ArrayList<String>();
-                    Map<String,Collection<String>> propsDeps = new HashMap<String, Collection<String>>();
-                    generateComputedProperties(w, e.getEnclosedElements(), propsGetSet, propsDeps);
-                    generateProperties(w, p.properties(), propsGetSet, propsDeps);
-                    w.append("  private org.apidesign.bck2brwsr.htmlpage.Knockout ko;\n");
-                    if (!propsGetSet.isEmpty()) {
-                        w.write("public " + className + " applyBindings() {\n");
-                        w.write("  ko = org.apidesign.bck2brwsr.htmlpage.Knockout.applyBindings(");
-                        w.write(className + ".class, this, ");
-                        w.write("new String[] {\n");
-                        String sep = "";
-                        for (String n : propsGetSet) {
-                            w.write(sep);
-                            if (n == null) {
-                                w.write("    null");
-                            } else {
-                                w.write("    \"" + n + "\"");
-                            }
-                            sep = ",\n";
-                        }
-                        w.write("\n  });\n  return this;\n}\n");
-                        
-                        w.write("public void triggerEvent(Element e, OnEvent ev) {\n");
-                        w.write("  org.apidesign.bck2brwsr.htmlpage.Knockout.triggerEvent(e.getId(), ev.getElementPropertyName());\n");
-                        w.write("}\n");
-                    }
-                    w.append("}\n");
-                } finally {
-                    w.close();
-                }
-            } catch (IOException ex) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Can't create " + className + ".java", e);
-                return false;
+        boolean ok = true;
+        for (Element e : roundEnv.getElementsAnnotatedWith(Model.class)) {
+            if (!processModel(e)) {
+                ok = false;
             }
         }
-        return true;
+        for (Element e : roundEnv.getElementsAnnotatedWith(Page.class)) {
+            if (!processPage(e)) {
+                ok = false;
+            }
+        }
+        return ok;
     }
 
     private InputStream openStream(String pkg, String name) throws IOException {
@@ -157,6 +98,145 @@
             return processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, pkg, name).openInputStream();
         }
     }
+    
+    private boolean processModel(Element e) {
+        boolean ok = true;
+        Model m = e.getAnnotation(Model.class);
+        if (m == null) {
+            return true;
+        }
+        String pkg = findPkgName(e);
+        Writer w;
+        String className = m.className();
+        try {
+            StringWriter body = new StringWriter();
+            List<String> propsGetSet = new ArrayList<>();
+            Map<String, Collection<String>> propsDeps = new HashMap<>();
+            if (!generateComputedProperties(body, m.properties(), e.getEnclosedElements(), propsGetSet, propsDeps)) {
+                ok = false;
+            }
+            if (!generateProperties(e, body, m.properties(), propsGetSet, propsDeps)) {
+                ok = false;
+            }
+            FileObject java = processingEnv.getFiler().createSourceFile(pkg + '.' + className, e);
+            w = new OutputStreamWriter(java.openOutputStream());
+            try {
+                w.append("package " + pkg + ";\n");
+                w.append("import org.apidesign.bck2brwsr.htmlpage.api.*;\n");
+                w.append("import org.apidesign.bck2brwsr.htmlpage.KOList;\n");
+                w.append("final class ").append(className).append(" {\n");
+                w.append("  private Object json;\n");
+                w.append("  private boolean locked;\n");
+                w.append("  private org.apidesign.bck2brwsr.htmlpage.Knockout ko;\n");
+                w.append(body.toString());
+                w.append("}\n");
+            } finally {
+                w.close();
+            }
+        } catch (IOException ex) {
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Can't create " + className + ".java", e);
+            return false;
+        }
+        return ok;
+    }
+    
+    private boolean processPage(Element e) {
+        boolean ok = true;
+        Page p = e.getAnnotation(Page.class);
+        if (p == null) {
+            return true;
+        }
+        String pkg = findPkgName(e);
+
+        ProcessPage pp;
+        try (InputStream is = openStream(pkg, p.xhtml())) {
+            pp = ProcessPage.readPage(is);
+            is.close();
+        } catch (IOException iOException) {
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Can't read " + p.xhtml(), e);
+            ok = false;
+            pp = null;
+        }
+        Writer w;
+        String className = p.className();
+        if (className.isEmpty()) {
+            int indx = p.xhtml().indexOf('.');
+            className = p.xhtml().substring(0, indx);
+        }
+        try {
+            StringWriter body = new StringWriter();
+            List<String> propsGetSet = new ArrayList<>();
+            List<String> functions = new ArrayList<>();
+            Map<String, Collection<String>> propsDeps = new HashMap<>();
+            if (!generateComputedProperties(body, p.properties(), e.getEnclosedElements(), propsGetSet, propsDeps)) {
+                ok = false;
+            }
+            if (!generateProperties(e, body, p.properties(), propsGetSet, propsDeps)) {
+                ok = false;
+            }
+            if (!generateFunctions(e, body, className, e.getEnclosedElements(), functions)) {
+                ok = false;
+            }
+            
+            FileObject java = processingEnv.getFiler().createSourceFile(pkg + '.' + className, e);
+            w = new OutputStreamWriter(java.openOutputStream());
+            try {
+                w.append("package " + pkg + ";\n");
+                w.append("import org.apidesign.bck2brwsr.htmlpage.api.*;\n");
+                w.append("import org.apidesign.bck2brwsr.htmlpage.KOList;\n");
+                w.append("final class ").append(className).append(" {\n");
+                w.append("  private boolean locked;\n");
+                if (!initializeOnClick(className, (TypeElement) e, w, pp)) {
+                    ok = false;
+                } else {
+                    for (String id : pp.ids()) {
+                        String tag = pp.tagNameForId(id);
+                        String type = type(tag);
+                        w.append("  ").append("public final ").
+                            append(type).append(' ').append(cnstnt(id)).append(" = new ").
+                            append(type).append("(\"").append(id).append("\");\n");
+                    }
+                }
+                w.append("  private org.apidesign.bck2brwsr.htmlpage.Knockout ko;\n");
+                w.append(body.toString());
+                if (!propsGetSet.isEmpty()) {
+                    w.write("public " + className + " applyBindings() {\n");
+                    w.write("  ko = org.apidesign.bck2brwsr.htmlpage.Knockout.applyBindings(");
+                    w.write(className + ".class, this, ");
+                    w.write("new String[] {\n");
+                    String sep = "";
+                    for (String n : propsGetSet) {
+                        w.write(sep);
+                        if (n == null) {
+                            w.write("    null");
+                        } else {
+                            w.write("    \"" + n + "\"");
+                        }
+                        sep = ",\n";
+                    }
+                    w.write("\n  }, new String[] {\n");
+                    sep = "";
+                    for (String n : functions) {
+                        w.write(sep);
+                        w.write(n);
+                        sep = ",\n";
+                    }
+                    w.write("\n  });\n  return this;\n}\n");
+
+                    w.write("public void triggerEvent(Element e, OnEvent ev) {\n");
+                    w.write("  org.apidesign.bck2brwsr.htmlpage.Knockout.triggerEvent(e.getId(), ev.getElementPropertyName());\n");
+                    w.write("}\n");
+                }
+                w.append("}\n");
+            } finally {
+                w.close();
+            }
+        } catch (IOException ex) {
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Can't create " + className + ".java", e);
+            return false;
+        }
+        return ok;
+    }
 
     private static String type(String tag) {
         if (tag.equals("title")) {
@@ -184,6 +264,7 @@
     private boolean initializeOnClick(
         String className, TypeElement type, Writer w, ProcessPage pp
     ) throws IOException {
+        boolean ok = true;
         TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
         { //for (Element clazz : pe.getEnclosedElements()) {
           //  if (clazz.getKind() != ElementKind.CLASS) {
@@ -196,58 +277,27 @@
                 On oc = method.getAnnotation(On.class);
                 if (oc != null) {
                     for (String id : oc.id()) {
+                        if (pp == null) {
+                            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "id = " + id + " not found in HTML page.");
+                            ok = false;
+                            continue;
+                        }
                         if (pp.tagNameForId(id) == null) {
                             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "id = " + id + " does not exist in the HTML page. Found only " + pp.ids(), method);
-                            return false;
+                            ok = false;
+                            continue;
                         }
                         ExecutableElement ee = (ExecutableElement)method;
-                        StringBuilder params = new StringBuilder();
-                        {
-                            boolean first = true;
-                            for (VariableElement ve : ee.getParameters()) {
-                                if (!first) {
-                                    params.append(", ");
-                                }
-                                first = false;
-                                if (ve.asType() == stringType) {
-                                    if (ve.getSimpleName().contentEquals("id")) {
-                                        params.append('"').append(id).append('"');
-                                        continue;
-                                    }
-                                    params.append("org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toString(ev, \"");
-                                    params.append(ve.getSimpleName().toString());
-                                    params.append("\")");
-                                    continue;
-                                }
-                                if (processingEnv.getTypeUtils().getPrimitiveType(TypeKind.DOUBLE) == ve.asType()) {
-                                    params.append("org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toDouble(ev, \"");
-                                    params.append(ve.getSimpleName().toString());
-                                    params.append("\")");
-                                    continue;
-                                }
-                                String rn = ve.asType().toString();
-                                int last = rn.lastIndexOf('.');
-                                if (last >= 0) {
-                                    rn = rn.substring(last + 1);
-                                }
-                                if (rn.equals(className)) {
-                                    params.append(className).append(".this");
-                                    continue;
-                                }
-                                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
-                                    "@On method can only accept String named 'id' or " + className + " arguments",
-                                    ee
-                                );
-                                return false;
-                            }
-                        }
+                        CharSequence params = wrapParams(ee, id, className, "ev", null);
                         if (!ee.getModifiers().contains(Modifier.STATIC)) {
                             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "@On method has to be static", ee);
-                            return false;
+                            ok = false;
+                            continue;
                         }
                         if (ee.getModifiers().contains(Modifier.PRIVATE)) {
                             processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "@On method can't be private", ee);
-                            return false;
+                            ok = false;
+                            continue;
                         }
                         w.append("  OnEvent." + oc.event()).append(".of(").append(cnstnt(id)).
                             append(").perform(new OnDispatch(" + dispatchCnt + "));\n");
@@ -278,7 +328,7 @@
             
 
         }
-        return true;
+        return ok;
     }
 
     @Override
@@ -292,8 +342,7 @@
         
         Element cls = findClass(element);
         Page p = cls.getAnnotation(Page.class);
-        PackageElement pe = (PackageElement) cls.getEnclosingElement();
-        String pkg = pe.getQualifiedName().toString();
+        String pkg = findPkgName(cls);
         ProcessPage pp;
         try {
             InputStream is = openStream(pkg, p.xhtml());
@@ -303,7 +352,7 @@
             return Collections.emptyList();
         }
         
-        List<Completion> cc = new ArrayList<Completion>();
+        List<Completion> cc = new ArrayList<>();
         userText = userText.substring(1);
         for (String id : pp.ids()) {
             if (id.startsWith(userText)) {
@@ -324,44 +373,70 @@
         return e.getEnclosingElement();
     }
 
-    private static void generateProperties(
-        Writer w, Property[] properties, Collection<String> props,
-        Map<String,Collection<String>> deps
+    private boolean generateProperties(
+        Element where,
+        Writer w, Property[] properties,
+        Collection<String> props, Map<String,Collection<String>> deps
     ) throws IOException {
+        boolean ok = true;
         for (Property p : properties) {
-            final String tn = typeName(p);
-            String[] gs = toGetSet(p.name(), tn);
+            final String tn;
+            tn = typeName(where, p);
+            String[] gs = toGetSet(p.name(), tn, p.array());
 
-            w.write("private " + tn + " prop_" + p.name() + ";\n");
-            w.write("public " + tn + " " + gs[0] + "() {\n");
-            w.write("  if (locked) throw new IllegalStateException();\n");
-            w.write("  return prop_" + p.name() + ";\n");
-            w.write("}\n");
-            w.write("public void " + gs[1] + "(" + tn + " v) {\n");
-            w.write("  if (locked) throw new IllegalStateException();\n");
-            w.write("  prop_" + p.name() + " = v;\n");
-            w.write("  if (ko != null) {\n");
-            w.write("    ko.valueHasMutated(\"" + p.name() + "\");\n");
-            final Collection<String> dependants = deps.get(p.name());
-            if (dependants != null) {
-                for (String depProp : dependants) {
-                    w.write("    ko.valueHasMutated(\"" + depProp + "\");\n");
+            if (p.array()) {
+                w.write("private KOList<" + tn + "> prop_" + p.name() + " = new KOList<" + tn + ">(\""
+                    + p.name() + "\"");
+                final Collection<String> dependants = deps.get(p.name());
+                if (dependants != null) {
+                    for (String depProp : dependants) {
+                        w.write(", ");
+                        w.write('\"');
+                        w.write(depProp);
+                        w.write('\"');
+                    }
                 }
+                w.write(");\n");
+                w.write("public java.util.List<" + tn + "> " + gs[0] + "() {\n");
+                w.write("  if (locked) throw new IllegalStateException();\n");
+                w.write("  prop_" + p.name() + ".assign(ko);\n");
+                w.write("  return prop_" + p.name() + ";\n");
+                w.write("}\n");
+            } else {
+                w.write("private " + tn + " prop_" + p.name() + ";\n");
+                w.write("public " + tn + " " + gs[0] + "() {\n");
+                w.write("  if (locked) throw new IllegalStateException();\n");
+                w.write("  return prop_" + p.name() + ";\n");
+                w.write("}\n");
+                w.write("public void " + gs[1] + "(" + tn + " v) {\n");
+                w.write("  if (locked) throw new IllegalStateException();\n");
+                w.write("  prop_" + p.name() + " = v;\n");
+                w.write("  if (ko != null) {\n");
+                w.write("    ko.valueHasMutated(\"" + p.name() + "\");\n");
+                final Collection<String> dependants = deps.get(p.name());
+                if (dependants != null) {
+                    for (String depProp : dependants) {
+                        w.write("    ko.valueHasMutated(\"" + depProp + "\");\n");
+                    }
+                }
+                w.write("  }\n");
+                w.write("}\n");
             }
-            w.write("  }\n");
-            w.write("}\n");
             
             props.add(p.name());
             props.add(gs[2]);
             props.add(gs[3]);
             props.add(gs[0]);
         }
+        return ok;
     }
 
     private boolean generateComputedProperties(
-        Writer w, Collection<? extends Element> arr, Collection<String> props,
+        Writer w, Property[] fixedProps,
+        Collection<? extends Element> arr, Collection<String> props,
         Map<String,Collection<String>> deps
     ) throws IOException {
+        boolean ok = true;
         for (Element e : arr) {
             if (e.getKind() != ElementKind.METHOD) {
                 continue;
@@ -370,23 +445,36 @@
                 continue;
             }
             ExecutableElement ee = (ExecutableElement)e;
-            final String tn = ee.getReturnType().toString();
+            final TypeMirror rt = ee.getReturnType();
+            final Types tu = processingEnv.getTypeUtils();
+            TypeMirror ert = tu.erasure(rt);
+            String tn = ert.toString();
+            boolean array = false;
+            if (tn.equals("java.util.List")) {
+                array = true;
+            }
+            
             final String sn = ee.getSimpleName().toString();
-            String[] gs = toGetSet(sn, tn);
+            String[] gs = toGetSet(sn, tn, array);
             
             w.write("public " + tn + " " + gs[0] + "() {\n");
             w.write("  if (locked) throw new IllegalStateException();\n");
             int arg = 0;
             for (VariableElement pe : ee.getParameters()) {
                 final String dn = pe.getSimpleName().toString();
+                
+                if (!verifyPropName(pe, dn, fixedProps)) {
+                    ok = false;
+                }
+                
                 final String dt = pe.asType().toString();
-                String[] call = toGetSet(dn, dt);
+                String[] call = toGetSet(dn, dt, false);
                 w.write("  " + dt + " arg" + (++arg) + " = ");
                 w.write(call[0] + "();\n");
                 
                 Collection<String> depends = deps.get(dn);
                 if (depends == null) {
-                    depends = new LinkedHashSet<String>();
+                    depends = new LinkedHashSet<>();
                     deps.put(dn, depends);
                 }
                 depends.add(sn);
@@ -405,17 +493,17 @@
             w.write("    locked = false;\n");
             w.write("  }\n");
             w.write("}\n");
-            
+
             props.add(e.getSimpleName().toString());
             props.add(gs[2]);
             props.add(null);
             props.add(gs[0]);
         }
         
-        return true;
+        return ok;
     }
 
-    private static String[] toGetSet(String name, String type) {
+    private static String[] toGetSet(String name, String type, boolean array) {
         String n = Character.toUpperCase(name.charAt(0)) + name.substring(1);
         String bck2brwsrType = "L" + type.replace('.', '_') + "_2";
         if ("int".equals(type)) {
@@ -430,6 +518,14 @@
             bck2brwsrType = "Z";
         }
         final String nu = n.replace('.', '_');
+        if (array) {
+            return new String[] { 
+                "get" + n,
+                null,
+                "get" + nu + "__Ljava_util_List_2",
+                null
+            };
+        }
         return new String[]{
             pref + n, 
             "set" + n, 
@@ -438,11 +534,196 @@
         };
     }
 
-    private static String typeName(Property p) {
+    private String typeName(Element where, Property p) {
+        String ret;
+        boolean isModel = false;
         try {
-            return p.type().getName();
+            ret = p.type().getName();
         } catch (MirroredTypeException ex) {
-            return ex.getTypeMirror().toString();
+            TypeMirror tm = processingEnv.getTypeUtils().erasure(ex.getTypeMirror());
+            final Element e = processingEnv.getTypeUtils().asElement(tm);
+            final Model m = e == null ? null : e.getAnnotation(Model.class);
+            if (m != null) {
+                ret = findPkgName(e) + '.' + m.className();
+                isModel = true;
+            } else {
+                ret = tm.toString();
+            }
+        }
+        if (p.array()) {
+            String bt = findBoxedType(ret);
+            if (bt != null) {
+                return bt;
+            }
+        }
+        if (!isModel && !"java.lang.String".equals(ret)) {
+            String bt = findBoxedType(ret);
+            if (bt == null) {
+                processingEnv.getMessager().printMessage(
+                    Diagnostic.Kind.ERROR, 
+                    "Only primitive types supported in the mapping. Not " + ret,
+                    where
+                );
+            }
+        }
+        return ret;
+    }
+    
+    private static String findBoxedType(String ret) {
+        if (ret.equals("boolean")) {
+            return Boolean.class.getName();
+        }
+        if (ret.equals("byte")) {
+            return Byte.class.getName();
+        }
+        if (ret.equals("short")) {
+            return Short.class.getName();
+        }
+        if (ret.equals("char")) {
+            return Character.class.getName();
+        }
+        if (ret.equals("int")) {
+            return Integer.class.getName();
+        }
+        if (ret.equals("long")) {
+            return Long.class.getName();
+        }
+        if (ret.equals("float")) {
+            return Float.class.getName();
+        }
+        if (ret.equals("double")) {
+            return Double.class.getName();
+        }
+        return null;
+    }
+
+    private boolean verifyPropName(Element e, String propName, Property[] existingProps) {
+        StringBuilder sb = new StringBuilder();
+        String sep = "";
+        for (Property property : existingProps) {
+            if (property.name().equals(propName)) {
+                return true;
+            }
+            sb.append(sep);
+            sb.append('"');
+            sb.append(property.name());
+            sb.append('"');
+            sep = ", ";
+        }
+        processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR,
+            propName + " is not one of known properties: " + sb
+            , e
+        );
+        return false;
+    }
+
+    private static String findPkgName(Element e) {
+        for (;;) {
+            if (e.getKind() == ElementKind.PACKAGE) {
+                return ((PackageElement)e).getQualifiedName().toString();
+            }
+            e = e.getEnclosingElement();
         }
     }
+
+    private boolean generateFunctions(
+        Element clazz, StringWriter body, String className, 
+        List<? extends Element> enclosedElements, List<String> functions
+    ) {
+        for (Element m : enclosedElements) {
+            if (m.getKind() != ElementKind.METHOD) {
+                continue;
+            }
+            ExecutableElement e = (ExecutableElement)m;
+            OnFunction onF = e.getAnnotation(OnFunction.class);
+            if (onF == null) {
+                continue;
+            }
+            if (!e.getModifiers().contains(Modifier.STATIC)) {
+                processingEnv.getMessager().printMessage(
+                    Diagnostic.Kind.ERROR, "@OnFunction method needs to be static", e
+                );
+                return false;
+            }
+            if (e.getModifiers().contains(Modifier.PRIVATE)) {
+                processingEnv.getMessager().printMessage(
+                    Diagnostic.Kind.ERROR, "@OnFunction method cannot be private", e
+                );
+                return false;
+            }
+            if (e.getReturnType().getKind() != TypeKind.VOID) {
+                processingEnv.getMessager().printMessage(
+                    Diagnostic.Kind.ERROR, "@OnFunction method should return void", e
+                );
+                return false;
+            }
+            String n = e.getSimpleName().toString();
+            body.append("void ").append(n).append("(Object data, Object ev) {\n");
+            body.append("  ").append(clazz.getSimpleName()).append(".").append(n).append("(");
+            body.append(wrapParams(e, null, className, "ev", "data"));
+            body.append(");\n");
+            body.append("}\n");
+            
+            functions.add('\"' + n + '\"');
+            functions.add('\"' + n + "__VLjava_lang_Object_2Ljava_lang_Object_2" + '\"');
+        }
+        return true;
+    }
+
+    private CharSequence wrapParams(
+        ExecutableElement ee, String id, String className, String evName, String dataName
+    ) {
+        TypeMirror stringType = processingEnv.getElementUtils().getTypeElement("java.lang.String").asType();
+        StringBuilder params = new StringBuilder();
+        boolean first = true;
+        for (VariableElement ve : ee.getParameters()) {
+            if (!first) {
+                params.append(", ");
+            }
+            first = false;
+            String toCall = null;
+            if (ve.asType() == stringType) {
+                if (ve.getSimpleName().contentEquals("id")) {
+                    params.append('"').append(id).append('"');
+                    continue;
+                }
+                toCall = "org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toString";
+            }
+            if (ve.asType().getKind() == TypeKind.DOUBLE) {
+                toCall = "org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toDouble";
+            }
+            if (ve.asType().getKind() == TypeKind.INT) {
+                toCall = "org.apidesign.bck2brwsr.htmlpage.ConvertTypes.toInt";
+            }
+
+            if (toCall != null) {
+                params.append(toCall).append('(');
+                if (dataName != null && ve.getSimpleName().contentEquals("data")) {
+                    params.append(dataName);
+                    params.append(", null");
+                } else {
+                    params.append(evName);
+                    params.append(", \"");
+                    params.append(ve.getSimpleName().toString());
+                    params.append("\"");
+                }
+                params.append(")");
+                continue;
+            }
+            String rn = ve.asType().toString();
+            int last = rn.lastIndexOf('.');
+            if (last >= 0) {
+                rn = rn.substring(last + 1);
+            }
+            if (rn.equals(className)) {
+                params.append(className).append(".this");
+                continue;
+            }
+            processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, 
+                "@On method can only accept String named 'id' or " + className + " arguments",
+                ee
+            );
+        }
+        return params;
+    }
 }
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Model.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Model.java	Mon Mar 25 18:36:50 2013 +0100
@@ -0,0 +1,43 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Defines a model class named {@link #className()} which contains
+ * defined {@link #properties()}. This class can have methods 
+ * annotated by {@link ComputedProperty} which define derived
+ * properties in the model class.
+ * <p>
+ * The {@link #className() generated class} will have methods
+ * to convert the object <code>toJSON</code> and <code>fromJSON</code>.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface Model {
+    /** Name of the model class */
+    String className();
+    /** List of properties in the model.
+     */
+    Property[] properties();
+}
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/OnFunction.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/OnFunction.java	Mon Mar 25 18:36:50 2013 +0100
@@ -0,0 +1,34 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage.api;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** Methods in class annotated by {@link Model} or {@link Page} can be 
+ * annotated by this annotation to signal that they should be available
+ * as functions to users of the model classes.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.SOURCE)
+public @interface OnFunction {
+}
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Property.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Property.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Property.java	Mon Mar 25 18:36:50 2013 +0100
@@ -20,15 +20,36 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.List;
 
-/** Represents a property in a generated model of an HTML
- * {@link Page}.
+/** Represents a property. Either in a generated model of an HTML
+ * {@link Page} or in a class defined by {@link Model}.
  *
  * @author Jaroslav Tulach <jtulach@netbeans.org>
  */
 @Retention(RetentionPolicy.SOURCE)
 @Target({})
 public @interface Property {
+    /** Name of the property. Will be used to define proper getter and setter
+     * in the associated class.
+     * 
+     * @return valid java identifier
+     */
     String name();
+    
+    /** Type of the property. Can either be primitive type (like <code>int.class</code>,
+     * <code>double.class</code>, etc.), {@link String} or complex model
+     * class (defined by {@link Model} property).
+     * 
+     * @return the class of the property
+     */
     Class<?> type();
+    
+    /** Is this property an array of the {@link #type()} or a single value?
+     * If the property is an array, only its getter (returning mutable {@link List} of
+     * the boxed {@link #type()}).
+     * 
+     * @return true, if this is supposed to be an array of values.
+     */
+    boolean array() default false;
 }
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/Compile.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/Compile.java	Mon Mar 25 18:36:50 2013 +0100
@@ -0,0 +1,203 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Compile implements DiagnosticListener<JavaFileObject> {
+    private final List<Diagnostic<? extends JavaFileObject>> errors = new ArrayList<>();
+    private final Map<String, byte[]> classes;
+    private final String pkg;
+    private final String cls;
+    private final String html;
+
+    private Compile(String html, String code) throws IOException {
+        this.pkg = findPkg(code);
+        this.cls = findCls(code);
+        this.html = html;
+        classes = compile(html, code);
+    }
+
+    /** Performs compilation of given HTML page and associated Java code
+     */
+    public static Compile create(String html, String code) throws IOException {
+        return new Compile(html, code);
+    }
+    
+    /** Checks for given class among compiled resources */
+    public byte[] get(String res) {
+        return classes.get(res);
+    }
+    
+    /** Obtains errors created during compilation.
+     */
+    public List<Diagnostic<? extends JavaFileObject>> getErrors() {
+        List<Diagnostic<? extends JavaFileObject>> err = new ArrayList<>();
+        for (Diagnostic<? extends JavaFileObject> diagnostic : errors) {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                err.add(diagnostic);
+            }
+        }
+        return err;
+    }
+    
+    private Map<String, byte[]> compile(final String html, final String code) throws IOException {
+        StandardJavaFileManager sjfm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(this, null, null);
+
+        final Map<String, ByteArrayOutputStream> class2BAOS = new HashMap<>();
+
+        JavaFileObject file = new SimpleJavaFileObject(URI.create("mem://mem"), Kind.SOURCE) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return code;
+            }
+        };
+        final JavaFileObject htmlFile = new SimpleJavaFileObject(URI.create("mem://mem2"), Kind.OTHER) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return html;
+            }
+
+            @Override
+            public InputStream openInputStream() throws IOException {
+                return new ByteArrayInputStream(html.getBytes());
+            }
+        };
+        
+        final URI scratch;
+        try {
+            scratch = new URI("mem://mem3");
+        } catch (URISyntaxException ex) {
+            throw new IOException(ex);
+        }
+        
+        JavaFileManager jfm = new ForwardingJavaFileManager<JavaFileManager>(sjfm) {
+            @Override
+            public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException {
+                if (kind  == Kind.CLASS) {
+                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+                    class2BAOS.put(className.replace('.', '/') + ".class", buffer);
+                    return new SimpleJavaFileObject(sibling.toUri(), kind) {
+                        @Override
+                        public OutputStream openOutputStream() throws IOException {
+                            return buffer;
+                        }
+                    };
+                }
+                
+                if (kind == Kind.SOURCE) {
+                    return new SimpleJavaFileObject(scratch/*sibling.toUri()*/, kind) {
+                        private final ByteArrayOutputStream data = new ByteArrayOutputStream();
+                        @Override
+                        public OutputStream openOutputStream() throws IOException {
+                            return data;
+                        }
+
+                        @Override
+                        public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                            data.close();
+                            return new String(data.toByteArray());
+                        }
+                    };
+                }
+                
+                throw new IllegalStateException();
+            }
+
+            @Override
+            public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException {
+                if (location == StandardLocation.SOURCE_PATH) {
+                    if (packageName.equals(pkg)) {
+                        return htmlFile;
+                    }
+                }
+                
+                return null;
+            }
+            
+        };
+
+        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", "1.7", "-target", "1.7"), null, Arrays.asList(file)).call();
+
+        Map<String, byte[]> result = new HashMap<>();
+
+        for (Map.Entry<String, ByteArrayOutputStream> e : class2BAOS.entrySet()) {
+            result.put(e.getKey(), e.getValue().toByteArray());
+        }
+
+        return result;
+    }
+
+
+    @Override
+    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+        errors.add(diagnostic);
+    }
+    private static String findPkg(String java) throws IOException {
+        Pattern p = Pattern.compile("package\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}*;", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String pkg = m.group(1);
+        return pkg;
+    }
+    private static String findCls(String java) throws IOException {
+        Pattern p = Pattern.compile("class\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String cls = m.group(1);
+        return cls;
+    }
+
+    String getHtml() {
+        String fqn = "'" + pkg + '.' + cls + "'";
+        return html.replace("'${fqn}'", fqn);
+    }
+}
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/KnockoutTest.java
--- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/KnockoutTest.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/KnockoutTest.java	Mon Mar 25 18:36:50 2013 +0100
@@ -17,8 +17,11 @@
  */
 package org.apidesign.bck2brwsr.htmlpage;
 
+import java.util.List;
+import org.apidesign.bck2brwsr.core.JavaScriptBody;
 import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
 import org.apidesign.bck2brwsr.htmlpage.api.OnEvent;
+import org.apidesign.bck2brwsr.htmlpage.api.OnFunction;
 import org.apidesign.bck2brwsr.htmlpage.api.Page;
 import org.apidesign.bck2brwsr.htmlpage.api.Property;
 import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
@@ -31,7 +34,9 @@
  * @author Jaroslav Tulach <jtulach@netbeans.org>
  */
 @Page(xhtml="Knockout.xhtml", className="KnockoutModel", properties={
-    @Property(name="name", type=String.class)
+    @Property(name="name", type=String.class),
+    @Property(name="results", type=String.class, array = true),
+    @Property(name="callbackCount", type=int.class)
 }) 
 public class KnockoutTest {
     
@@ -50,13 +55,82 @@
         assert "Jardo".equals(m.getName()) : "Name property updated: " + m.getName();
     }
     
+    @HtmlFragment(
+        "<ul id='ul' data-bind='foreach: results'>\n"
+        + "  <li data-bind='text: $data, click: $root.call'/>\n"
+        + "</ul>\n"
+    )
+    @BrwsrTest public void displayContentOfArray() {
+        KnockoutModel m = new KnockoutModel();
+        m.getResults().add("Ahoj");
+        m.applyBindings();
+        
+        int cnt = countChildren("ul");
+        assert cnt == 1 : "One child, but was " + cnt;
+        
+        m.getResults().add("Hi");
+
+        cnt = countChildren("ul");
+        assert cnt == 2 : "Two children now, but was " + cnt;
+        
+        triggerChildClick("ul", 1);
+        
+        assert 1 == m.getCallbackCount() : "One callback " + m.getCallbackCount();
+        assert "Hi".equals(m.getName()) : "We got callback from 2nd child " + m.getName();
+    }
+    
+    @HtmlFragment(
+        "<ul id='ul' data-bind='foreach: cmpResults'>\n"
+        + "  <li><b data-bind='text: $data'></b></li>\n"
+        + "</ul>\n"
+    )
+    @BrwsrTest public void displayContentOfDerivedArray() {
+        KnockoutModel m = new KnockoutModel();
+        m.getResults().add("Ahoj");
+        m.applyBindings();
+        
+        int cnt = countChildren("ul");
+        assert cnt == 1 : "One child, but was " + cnt;
+        
+        m.getResults().add("hello");
+
+        cnt = countChildren("ul");
+        assert cnt == 2 : "Two children now, but was " + cnt;
+    }
+    
+    @OnFunction
+    static void call(KnockoutModel m, String data) {
+        m.setName(data);
+        m.setCallbackCount(m.getCallbackCount() + 1);
+    }
+    
     @ComputedProperty
     static String helloMessage(String name) {
         return "Hello " + name + "!";
     }
     
+    @ComputedProperty
+    static List<String> cmpResults(List<String> results) {
+        return results;
+    }
+    
     @Factory
     public static Object[] create() {
         return VMTest.create(KnockoutTest.class);
     }
+    
+    @JavaScriptBody(args = { "id" }, body = 
+          "var e = window.document.getElementById(id);\n "
+        + "if (typeof e === 'undefined') return -2;\n "
+        + "return e.children.length;\n "
+    )
+    private static native int countChildren(String id);
+
+    @JavaScriptBody(args = { "id", "pos" }, body = 
+          "var e = window.document.getElementById(id);\n "
+        + "var ev = window.document.createEvent('MouseEvents');\n "
+        + "ev.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);\n "
+        + "e.children[pos].dispatchEvent(ev);\n "
+    )
+    private static native void triggerChildClick(String id, int pos);
 }
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ModelTest.java
--- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ModelTest.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ModelTest.java	Mon Mar 25 18:36:50 2013 +0100
@@ -18,8 +18,12 @@
 package org.apidesign.bck2brwsr.htmlpage;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
+import org.apidesign.bck2brwsr.htmlpage.api.OnFunction;
 import org.apidesign.bck2brwsr.htmlpage.api.Page;
 import org.apidesign.bck2brwsr.htmlpage.api.Property;
 import static org.testng.Assert.*;
@@ -30,17 +34,21 @@
  *
  * @author Jaroslav Tulach <jtulach@netbeans.org>
  */
-@Page(xhtml = "Empty.html", className = "Model", properties = {
+@Page(xhtml = "Empty.html", className = "Modelik", properties = {
     @Property(name = "value", type = int.class),
-    @Property(name = "unrelated", type = long.class)
+    @Property(name = "count", type = int.class),
+    @Property(name = "unrelated", type = long.class),
+    @Property(name = "names", type = String.class, array = true),
+    @Property(name = "values", type = int.class, array = true),
+    @Property(name = "people", type = PersonImpl.class, array = true)
 })
 public class ModelTest {
-    private Model model;
-    private static Model leakedModel;
+    private Modelik model;
+    private static Modelik leakedModel;
     
     @BeforeMethod
     public void createModel() {
-        model = new Model();
+        model = new Modelik();
     }
     
     @Test public void classGeneratedWithSetterGetter() {
@@ -53,6 +61,75 @@
         assertEquals(16, model.getPowerValue());
     }
     
+    @Test public void arrayIsMutable() {
+        assertEquals(model.getNames().size(), 0, "Is empty");
+        model.getNames().add("Jarda");
+        assertEquals(model.getNames().size(), 1, "One element");
+    }
+    
+    @Test public void arrayChangesNotified() {
+        MockKnockout my = new MockKnockout();
+        MockKnockout.next = my;
+        
+        model.applyBindings();
+        
+        model.getNames().add("Hello");
+        
+        assertFalse(my.mutated.isEmpty(), "There was a change" + my.mutated);
+        assertTrue(my.mutated.contains("names"), "Change in names property: " + my.mutated);
+
+        my.mutated.clear();
+        
+        Iterator<String> it = model.getNames().iterator();
+        assertEquals(it.next(), "Hello");
+        it.remove();
+        
+        assertFalse(my.mutated.isEmpty(), "There was a change" + my.mutated);
+        assertTrue(my.mutated.contains("names"), "Change in names property: " + my.mutated);
+
+        my.mutated.clear();
+        
+        ListIterator<String> lit = model.getNames().listIterator();
+        lit.add("Jarda");
+        
+        assertFalse(my.mutated.isEmpty(), "There was a change" + my.mutated);
+        assertTrue(my.mutated.contains("names"), "Change in names property: " + my.mutated);
+    }
+    
+    @Test public void autoboxedArray() {
+        MockKnockout my = new MockKnockout();
+        MockKnockout.next = my;
+        
+        model.applyBindings();
+        
+        model.getValues().add(10);
+        
+        assertEquals(model.getValues().get(0), Integer.valueOf(10), "Really ten");
+    }
+
+    @Test public void derivedArrayProp() {
+        MockKnockout my = new MockKnockout();
+        MockKnockout.next = my;
+        
+        model.applyBindings();
+        
+        model.setCount(10);
+        
+        List<String> arr = model.getRepeat();
+        assertEquals(arr.size(), 10, "Ten items: " + arr);
+        
+        my.mutated.clear();
+        
+        model.setCount(5);
+        
+        arr = model.getRepeat();
+        assertEquals(arr.size(), 5, "Five items: " + arr);
+
+        assertEquals(my.mutated.size(), 2, "Two properties changed: " + my.mutated);
+        assertTrue(my.mutated.contains("repeat"), "Array is in there: " + my.mutated);
+        assertTrue(my.mutated.contains("count"), "Count is in there: " + my.mutated);
+    }
+    
     @Test public void derivedPropertiesAreNotified() {
         MockKnockout my = new MockKnockout();
         MockKnockout.next = my;
@@ -92,6 +169,10 @@
         }
     }
     
+    @OnFunction 
+    static void doSomething() {
+    }
+    
     @ComputedProperty
     static int powerValue(int value) {
         return value * value;
@@ -108,12 +189,27 @@
         return "Not allowed callback!";
     }
     
+    @ComputedProperty
+    static List<String> repeat(int count) {
+        return Collections.nCopies(count, "Hello");
+    }
+    
     static class MockKnockout extends Knockout {
-        List<String> mutated = new ArrayList<String>();
+        List<String> mutated = new ArrayList<>();
         
         @Override
         public void valueHasMutated(String prop) {
             mutated.add(prop);
         }
     }
+    
+    public @Test void hasPersonPropertyAndComputedFullName() {
+        List<Person> arr = model.getPeople();
+        assertEquals(arr.size(), 0, "By default empty");
+        Person p = null;
+        if (p != null) {
+            String fullNameGenerated = p.getFullName();
+            assertNotNull(fullNameGenerated);
+        }
+    }
 }
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PageTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PageTest.java	Mon Mar 25 18:36:50 2013 +0100
@@ -0,0 +1,50 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage;
+
+import java.io.IOException;
+import java.util.Locale;
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/** Verify errors emitted by the processor.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class PageTest {
+    @Test public void verifyWrongType() throws IOException {
+        String html = "<html><body>"
+            + "</body></html>";
+        String code = "package x.y.z;\n"
+            + "import org.apidesign.bck2brwsr.htmlpage.api.*;\n"
+            + "@Page(xhtml=\"index.xhtml\", className=\"Model\", properties={\n"
+            + "  @Property(name=\"prop\", type=Runnable.class)\n"
+            + "})\n"
+            + "class X {\n"
+            + "}\n";
+        
+        Compile c = Compile.create(html, code);
+        assertEquals(c.getErrors().size(), 1, "One error: " + c.getErrors());
+        
+        String msg = c.getErrors().get(0).getMessage(Locale.ENGLISH);
+        if (!msg.contains("Runnable")) {
+            fail("Should contain warning about Runnable: " + msg);
+        }
+    }
+    
+}
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PersonImpl.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PersonImpl.java	Mon Mar 25 18:36:50 2013 +0100
@@ -0,0 +1,43 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage;
+
+import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
+import org.apidesign.bck2brwsr.htmlpage.api.Model;
+import org.apidesign.bck2brwsr.htmlpage.api.Property;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+@Model(className = "Person", properties = {
+    @Property(name = "firstName", type = String.class),
+    @Property(name = "lastName", type = String.class),
+    @Property(name = "male", type = boolean.class)
+})
+final class PersonImpl {
+    @ComputedProperty 
+    public static String fullName(String firstName, String lastName) {
+        return firstName + " " + lastName;
+    }
+    
+    @ComputedProperty
+    public static String sex(boolean male) {
+        return male ? "Male" : "Female";
+    }
+}
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/demo-calculator-dynamic/pom.xml
--- a/javaquery/demo-calculator-dynamic/pom.xml	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/pom.xml	Mon Mar 25 18:36:50 2013 +0100
@@ -27,8 +27,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <directory>${project.build.directory}/${project.build.finalName}-bck2brwsr/public_html</directory>
-                    <startpage>index.xhtml</startpage>
+                    <startpage>org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml</startpage>
                 </configuration>
             </plugin>
          <plugin>
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java
--- a/javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/src/main/java/org/apidesign/bck2brwsr/demo/calc/Calc.java	Mon Mar 25 18:36:50 2013 +0100
@@ -17,9 +17,11 @@
  */
 package org.apidesign.bck2brwsr.demo.calc;
 
+import java.util.List;
 import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
 import org.apidesign.bck2brwsr.htmlpage.api.On;
 import static org.apidesign.bck2brwsr.htmlpage.api.OnEvent.*;
+import org.apidesign.bck2brwsr.htmlpage.api.OnFunction;
 import org.apidesign.bck2brwsr.htmlpage.api.Page;
 import org.apidesign.bck2brwsr.htmlpage.api.Property;
 
@@ -33,11 +35,12 @@
     @Property(name = "memory", type = double.class),
     @Property(name = "display", type = double.class),
     @Property(name = "operation", type = String.class),
-    @Property(name = "hover", type = boolean.class)
+    @Property(name = "hover", type = boolean.class),
+    @Property(name = "history", type = double.class, array = true)
 })
 public class Calc {
     static {
-        new Calculator().applyBindings();
+        new Calculator().applyBindings().setOperation("plus");
     }
     
     @On(event = CLICK, id="clear")
@@ -65,14 +68,28 @@
     
     @On(event = CLICK, id="result")
     static void computeTheValue(Calculator c) {
-        c.setDisplay(compute(
+        final double newValue = compute(
             c.getOperation(), 
             c.getMemory(), 
             c.getDisplay()
-        ));
+        );
+        c.setDisplay(newValue);
+        if (!c.getHistory().contains(newValue)) {
+            c.getHistory().add(newValue);
+        }
         c.setMemory(0);
     }
     
+    @OnFunction
+    static void recoverMemory(Calculator c, double data) {
+        c.setDisplay(data);
+    }
+
+    @OnFunction
+    static void removeMemory(Calculator c, double data) {
+        c.getHistory().remove(data);
+    }
+    
     private static double compute(String op, double memory, double display) {
         switch (op) {
             case "plus": return memory + display;
@@ -109,4 +126,9 @@
         }
         return "Attempt to compute " + memory + " " + operation + " " + display + " = " + compute(operation, memory, display);
     }
+    
+    @ComputedProperty
+    static boolean emptyHistory(List<?> history) {
+        return history.isEmpty();
+    }
 }
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml
--- a/javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/demo-calculator-dynamic/src/main/resources/org/apidesign/bck2brwsr/demo/calc/Calculator.xhtml	Mon Mar 25 18:36:50 2013 +0100
@@ -78,6 +78,17 @@
         </table>
         <div data-bind="text: displayPreview"></div>
         
+        <h4>Previous Results</h4>
+        
+        <div data-bind="if: emptyHistory">No results yet.</div>
+        <ul data-bind="foreach: history">
+            <li>
+                <span data-bind="text: $data"/> -
+                <a href="#" data-bind="click: $root.recoverMemory">Use</a>
+                <a href="#" data-bind="click: $root.removeMemory">Remove</a>
+            </li>
+        </ul>
+        
         <script src="bck2brwsr.js"></script>
         <script type="text/javascript">
             var vm = bck2brwsr('demo.calculator-0.5-SNAPSHOT.jar');
@@ -85,75 +96,5 @@
         </script>
         
         <hr/>
-    <pre>
-    <span class="keyword-directive">package</span> org.apidesign.bck2brwsr.mavenhtml;
-
-    <span class="keyword-directive">import</span> org.apidesign.bck2brwsr.htmlpage.api.OnClick;
-    <span class="keyword-directive">import</span> org.apidesign.bck2brwsr.htmlpage.api.Page;
-
-    <span class="comment">/**</span> <span class="comment">HTML5</span><span class="comment"> &amp; </span><span class="comment">Java</span> <span class="comment">demo</span> <span class="comment">showing</span> <span class="comment">the</span> <span class="comment">power</span> <span class="comment">of</span> <a href="http://wiki.apidesign.org/wiki/AnnotationProcessor">annotation processors</a>
-    <span class="comment"> * </span><span class="comment">as</span> <span class="comment">well</span> <span class="comment">as</span> <span class="comment">other</span> <span class="comment">goodies</span><span class="comment">, including type-safe association between</span>
-    <span class="comment"> * </span><span class="comment">an XHTML page and Java.</span>
-    <span class="comment"> * </span>
-    <span class="comment"> * </span><span class="ST1">@author</span> <span class="comment">Jaroslav</span> <span class="comment">Tulach</span> <span class="ST0">&lt;jaroslav.tulach@apidesign.org&gt;</span>
-     <span class="comment">*/</span>
-    @Page(xhtml=<span class="string">&quot;</span><span class="string">Calculator.xhtml</span><span class="string">&quot;</span>)
-    <span class="keyword-directive">public</span> <span class="keyword-directive">class</span> App {
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">double</span> memory;
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> String operation;
-
-        @OnClick(id=<span class="string">&quot;</span><span class="string">clear</span><span class="string">&quot;</span>)
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> clear() {
-            memory = <span class="number">0</span>;
-            operation = <span class="keyword-directive">null</span>;
-            Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">0</span><span class="string">&quot;</span>);
-        }
-
-        @OnClick(id= { <span class="string">&quot;</span><span class="string">plus</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">minus</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">mul</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">div</span><span class="string">&quot;</span> })
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> applyOp(String op) {
-            memory = getValue();
-            operation = op;
-            Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">0</span><span class="string">&quot;</span>);
-        }
-
-        @OnClick(id=<span class="string">&quot;</span><span class="string">result</span><span class="string">&quot;</span>)
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> computeTheValue() {
-            <span class="keyword-directive">switch</span> (operation) {
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">plus</span><span class="string">&quot;</span>: setValue(memory + getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">minus</span><span class="string">&quot;</span>: setValue(memory - getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">mul</span><span class="string">&quot;</span>: setValue(memory * getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">case</span> <span class="string">&quot;</span><span class="string">div</span><span class="string">&quot;</span>: setValue(memory / getValue()); <span class="keyword-directive">break</span>;
-                <span class="keyword-directive">default</span>: <span class="keyword-directive">throw</span> <span class="keyword-directive">new</span> IllegalStateException(operation);
-            }
-        }
-
-        @OnClick(id={<span class="string">&quot;</span><span class="string">n0</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n1</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n2</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n3</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n4</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n5</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n6</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n7</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n8</span><span class="string">&quot;</span>, <span class="string">&quot;</span><span class="string">n9</span><span class="string">&quot;</span>}) 
-        <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> addDigit(String digit) {
-            digit = digit.substring(<span class="number">1</span>);
-            String v = Calculator.DISPLAY.getValue();
-            <span class="keyword-directive">if</span> (getValue() == <span class="number">0.0</span>) {
-                Calculator.DISPLAY.setValue(digit);
-            } <span class="keyword-directive">else</span> {
-                Calculator.DISPLAY.setValue(v + digit);
-            }
-        }
-
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">void</span> setValue(<span class="keyword-directive">double</span> v) {
-            StringBuilder sb = <span class="keyword-directive">new</span> StringBuilder();
-            sb.append(v);
-            Calculator.DISPLAY.setValue(sb.toString());
-        }
-
-        <span class="keyword-directive">private</span> <span class="keyword-directive">static</span> <span class="keyword-directive">double</span> getValue() {
-            <span class="keyword-directive">try</span> {
-                <span class="keyword-directive">return</span> Double.parseDouble(Calculator.DISPLAY.getValue());
-            } <span class="keyword-directive">catch</span> (NumberFormatException ex) {
-                Calculator.DISPLAY.setValue(<span class="string">&quot;</span><span class="string">err</span><span class="string">&quot;</span>);
-                <span class="keyword-directive">return</span> <span class="number">0.0</span>;
-            }
-        }
-    }
-
-    </pre>
     </body>
 </html>
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/demo-calculator/pom.xml
--- a/javaquery/demo-calculator/pom.xml	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/demo-calculator/pom.xml	Mon Mar 25 18:36:50 2013 +0100
@@ -12,6 +12,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <bck2brwsr.obfuscationlevel>FULL</bck2brwsr.obfuscationlevel>
   </properties>
   <build>
       <plugins>
@@ -31,7 +32,7 @@
                     <directory>${project.build.directory}/${project.build.finalName}-bck2brwsr/public_html/</directory>
                     <startpage>index.xhtml</startpage>
                     <javascript>${project.build.directory}/bck2brwsr.js</javascript>
-                    <obfuscation>FULL</obfuscation>
+                    <obfuscation>${bck2brwsr.obfuscationlevel}</obfuscation>
                 </configuration>
             </plugin>
          <plugin>
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calc.java
--- a/javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calc.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/demo-calculator/src/main/java/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calc.java	Mon Mar 25 18:36:50 2013 +0100
@@ -17,9 +17,11 @@
  */
 package org.apidesign.bck2brwsr.demo.calc.staticcompilation;
 
+import java.util.List;
 import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
 import org.apidesign.bck2brwsr.htmlpage.api.On;
 import static org.apidesign.bck2brwsr.htmlpage.api.OnEvent.*;
+import org.apidesign.bck2brwsr.htmlpage.api.OnFunction;
 import org.apidesign.bck2brwsr.htmlpage.api.Page;
 import org.apidesign.bck2brwsr.htmlpage.api.Property;
 
@@ -33,11 +35,12 @@
     @Property(name = "memory", type = double.class),
     @Property(name = "display", type = double.class),
     @Property(name = "operation", type = String.class),
-    @Property(name = "hover", type = boolean.class)
+    @Property(name = "hover", type = boolean.class),
+    @Property(name = "history", type = double.class, array = true)
 })
 public class Calc {
     static {
-        new Calculator().applyBindings();
+        new Calculator().applyBindings().setOperation("plus");
     }
     
     @On(event = CLICK, id="clear")
@@ -65,14 +68,28 @@
     
     @On(event = CLICK, id="result")
     static void computeTheValue(Calculator c) {
-        c.setDisplay(compute(
+        final double newValue = compute(
             c.getOperation(), 
             c.getMemory(), 
             c.getDisplay()
-        ));
+        );
+        c.setDisplay(newValue);
+        if (!c.getHistory().contains(newValue)) {
+            c.getHistory().add(newValue);
+        }
         c.setMemory(0);
     }
     
+    @OnFunction
+    static void recoverMemory(Calculator c, double data) {
+        c.setDisplay(data);
+    }
+
+    @OnFunction
+    static void removeMemory(Calculator c, double data) {
+        c.getHistory().remove(data);
+    }
+    
     private static double compute(String op, double memory, double display) {
         switch (op) {
             case "plus": return memory + display;
@@ -109,4 +126,9 @@
         }
         return "Attempt to compute " + memory + " " + operation + " " + display + " = " + compute(operation, memory, display);
     }
+    
+    @ComputedProperty
+    static boolean emptyHistory(List<?> history) {
+        return history.isEmpty();
+    }
 }
diff -r 8c14a9f0c232 -r 63c6bddd814e javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml
--- a/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Mon Mar 25 13:33:03 2013 +0100
+++ b/javaquery/demo-calculator/src/main/resources/org/apidesign/bck2brwsr/demo/calc/staticcompilation/Calculator.xhtml	Mon Mar 25 18:36:50 2013 +0100
@@ -76,6 +76,18 @@
                 </tr>
             </tbody>
         </table>
+        
+        <h4>Previous Results</h4>
+        
+        <div data-bind="if: emptyHistory">No results yet.</div>
+        <ul data-bind="foreach: history">
+            <li>
+                <span data-bind="text: $data"/> -
+                <a href="#" data-bind="click: $root.recoverMemory">Use</a>
+                <a href="#" data-bind="click: $root.removeMemory">Remove</a>
+            </li>
+        </ul>
+        
         <div data-bind="text: displayPreview"></div>
         <script src="bck2brwsr.js"/>
         <script>
diff -r 8c14a9f0c232 -r 63c6bddd814e rt/emul/mini/src/main/java/java/lang/Class.java
--- a/rt/emul/mini/src/main/java/java/lang/Class.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/rt/emul/mini/src/main/java/java/lang/Class.java	Mon Mar 25 18:36:50 2013 +0100
@@ -402,8 +402,15 @@
             }
             return cmpType != null && getComponentType().isAssignableFrom(cmpType);
         }
-        String prop = "$instOf_" + getName().replace('.', '_');
-        return hasCnstrProperty(cls, prop);
+        if (isPrimitive()) {
+            return false;
+        } else {
+            if (cls.isPrimitive()) {
+                return false;
+            }
+            String prop = "$instOf_" + getName().replace('.', '_');
+            return hasCnstrProperty(cls, prop);
+        }
     }
 
     @JavaScriptBody(args = { "who", "prop" }, body = 
diff -r 8c14a9f0c232 -r 63c6bddd814e rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java
--- a/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/rt/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/Bck2BrwsrLauncher.java	Mon Mar 25 18:36:50 2013 +0100
@@ -317,9 +317,13 @@
                 int cnt = is.read() - '0';
                 if (cnt == 'U' - '0') {
                     os.write(baseURL.getBytes("UTF-8"));
-                }
-                if (cnt >= 0 && cnt < params.length) {
-                    os.write(params[cnt].getBytes("UTF-8"));
+                } else {
+                    if (cnt >= 0 && cnt < params.length) {
+                        os.write(params[cnt].getBytes("UTF-8"));
+                    } else {
+                        os.write('$');
+                        os.write(cnt + '0');
+                    }
                 }
             } else {
                 os.write(ch);
diff -r 8c14a9f0c232 -r 63c6bddd814e rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionTest.java
--- a/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionTest.java	Mon Mar 25 13:33:03 2013 +0100
+++ b/rt/vmtest/src/test/java/org/apidesign/bck2brwsr/tck/ReflectionTest.java	Mon Mar 25 18:36:50 2013 +0100
@@ -53,6 +53,22 @@
         return Runnable.class.isInterface();
     }
 
+    @Compare public boolean isAssignableToPrimitiveType() {
+        return boolean.class.isAssignableFrom(Runnable.class);
+    }
+
+    @Compare public boolean isAssignableFromPrimitiveType() {
+        return Runnable.class.isAssignableFrom(boolean.class);
+    }
+
+    @Compare public boolean isAssignableLongFromInt() {
+        return long.class.isAssignableFrom(int.class);
+    }
+
+    @Compare public boolean isAssignableIntFromLong() {
+        return int.class.isAssignableFrom(long.class);
+    }
+
     @Compare public String isRunnableHasRunMethod() throws NoSuchMethodException {
         return Runnable.class.getMethod("run").getName();
     }