1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/KOList.java Mon Feb 18 13:03:01 2013 +0100
1.3 @@ -0,0 +1,107 @@
1.4 +/**
1.5 + * Back 2 Browser Bytecode Translator
1.6 + * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
1.7 + *
1.8 + * This program is free software: you can redistribute it and/or modify
1.9 + * it under the terms of the GNU General Public License as published by
1.10 + * the Free Software Foundation, version 2 of the License.
1.11 + *
1.12 + * This program is distributed in the hope that it will be useful,
1.13 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1.14 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.15 + * GNU General Public License for more details.
1.16 + *
1.17 + * You should have received a copy of the GNU General Public License
1.18 + * along with this program. Look for COPYING file in the top folder.
1.19 + * If not, see http://opensource.org/licenses/GPL-2.0.
1.20 + */
1.21 +package org.apidesign.bck2brwsr.htmlpage;
1.22 +
1.23 +import java.util.ArrayList;
1.24 +import java.util.Collection;
1.25 +
1.26 +/**
1.27 + *
1.28 + * @author Jaroslav Tulach <jtulach@netbeans.org>
1.29 + */
1.30 +public final class KOList<T> extends ArrayList<T> {
1.31 + private final String name;
1.32 + private final String[] deps;
1.33 + private Knockout model;
1.34 +
1.35 + public KOList(String name, String... deps) {
1.36 + this.name = name;
1.37 + this.deps = deps;
1.38 + }
1.39 +
1.40 + public void assign(Knockout model) {
1.41 + this.model = model;
1.42 + }
1.43 +
1.44 + @Override
1.45 + public boolean add(T e) {
1.46 + boolean ret = super.add(e);
1.47 + notifyChange();
1.48 + return ret;
1.49 + }
1.50 +
1.51 + @Override
1.52 + public boolean remove(Object o) {
1.53 + boolean ret = super.remove(o);
1.54 + notifyChange();
1.55 + return ret;
1.56 + }
1.57 +
1.58 + @Override
1.59 + public void clear() {
1.60 + super.clear();
1.61 + notifyChange();
1.62 + }
1.63 +
1.64 + @Override
1.65 + public boolean removeAll(Collection<?> c) {
1.66 + boolean ret = super.removeAll(c);
1.67 + notifyChange();
1.68 + return ret;
1.69 + }
1.70 +
1.71 + @Override
1.72 + public boolean retainAll(Collection<?> c) {
1.73 + boolean ret = super.retainAll(c);
1.74 + notifyChange();
1.75 + return ret;
1.76 + }
1.77 +
1.78 + @Override
1.79 + public T set(int index, T element) {
1.80 + T ret = super.set(index, element);
1.81 + notifyChange();
1.82 + return ret;
1.83 + }
1.84 +
1.85 + @Override
1.86 + public void add(int index, T element) {
1.87 + super.add(index, element);
1.88 + notifyChange();
1.89 + }
1.90 +
1.91 + @Override
1.92 + public T remove(int index) {
1.93 + T ret = super.remove(index);
1.94 + notifyChange();
1.95 + return ret;
1.96 + }
1.97 +
1.98 + private void notifyChange() {
1.99 + Knockout m = model;
1.100 + if (m == null) {
1.101 + return;
1.102 + }
1.103 + m.valueHasMutated(name);
1.104 + for (String dependant : deps) {
1.105 + m.valueHasMutated(dependant);
1.106 + }
1.107 + }
1.108 +
1.109 +
1.110 +}
2.1 --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Mon Feb 18 12:26:16 2013 +0100
2.2 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Mon Feb 18 13:03:01 2013 +0100
2.3 @@ -97,6 +97,7 @@
2.4 try {
2.5 w.append("package " + pkg + ";\n");
2.6 w.append("import org.apidesign.bck2brwsr.htmlpage.api.*;\n");
2.7 + w.append("import org.apidesign.bck2brwsr.htmlpage.KOList;\n");
2.8 w.append("final class ").append(className).append(" {\n");
2.9 w.append(" private boolean locked;\n");
2.10 if (!initializeOnClick(className, (TypeElement) e, w, pp)) {
2.11 @@ -320,9 +321,21 @@
2.12 String[] gs = toGetSet(p.name(), tn, p.array());
2.13
2.14 if (p.array()) {
2.15 - w.write("private java.util.List<" + tn + "> prop_" + p.name() + " = new java.util.ArrayList<" + tn + ">();\n");
2.16 + w.write("private KOList<" + tn + "> prop_" + p.name() + " = new KOList<" + tn + ">(\""
2.17 + + p.name() + "\"");
2.18 + final Collection<String> dependants = deps.get(p.name());
2.19 + if (dependants != null) {
2.20 + for (String depProp : dependants) {
2.21 + w.write(", ");
2.22 + w.write('\"');
2.23 + w.write(depProp);
2.24 + w.write('\"');
2.25 + }
2.26 + }
2.27 + w.write(");\n");
2.28 w.write("public java.util.List<" + tn + "> " + gs[0] + "() {\n");
2.29 w.write(" if (locked) throw new IllegalStateException();\n");
2.30 + w.write(" prop_" + p.name() + ".assign(ko);\n");
2.31 w.write(" return prop_" + p.name() + ";\n");
2.32 w.write("}\n");
2.33 } else {
3.1 --- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ModelTest.java Mon Feb 18 12:26:16 2013 +0100
3.2 +++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ModelTest.java Mon Feb 18 13:03:01 2013 +0100
3.3 @@ -18,7 +18,9 @@
3.4 package org.apidesign.bck2brwsr.htmlpage;
3.5
3.6 import java.util.ArrayList;
3.7 +import java.util.Iterator;
3.8 import java.util.List;
3.9 +import java.util.ListIterator;
3.10 import org.apidesign.bck2brwsr.htmlpage.api.ComputedProperty;
3.11 import org.apidesign.bck2brwsr.htmlpage.api.Page;
3.12 import org.apidesign.bck2brwsr.htmlpage.api.Property;
3.13 @@ -60,6 +62,35 @@
3.14 assertEquals(model.getNames().size(), 1, "One element");
3.15 }
3.16
3.17 + @Test public void arrayChangesNotified() {
3.18 + MockKnockout my = new MockKnockout();
3.19 + MockKnockout.next = my;
3.20 +
3.21 + model.applyBindings();
3.22 +
3.23 + model.getNames().add("Hello");
3.24 +
3.25 + assertFalse(my.mutated.isEmpty(), "There was a change" + my.mutated);
3.26 + assertTrue(my.mutated.contains("names"), "Change in names property: " + my.mutated);
3.27 +
3.28 + my.mutated.clear();
3.29 +
3.30 + Iterator<String> it = model.getNames().iterator();
3.31 + assertEquals(it.next(), "Hello");
3.32 + it.remove();
3.33 +
3.34 + assertFalse(my.mutated.isEmpty(), "There was a change" + my.mutated);
3.35 + assertTrue(my.mutated.contains("names"), "Change in names property: " + my.mutated);
3.36 +
3.37 + my.mutated.clear();
3.38 +
3.39 + ListIterator<String> lit = model.getNames().listIterator();
3.40 + lit.add("Jarda");
3.41 +
3.42 + assertFalse(my.mutated.isEmpty(), "There was a change" + my.mutated);
3.43 + assertTrue(my.mutated.contains("names"), "Change in names property: " + my.mutated);
3.44 + }
3.45 +
3.46 @Test public void derivedPropertiesAreNotified() {
3.47 MockKnockout my = new MockKnockout();
3.48 MockKnockout.next = my;