1.1 --- a/ko-archetype/src/main/resources/archetype-resources/src/main/java/TwitterClient.java Tue May 28 23:06:45 2013 +0200
1.2 +++ b/ko-archetype/src/main/resources/archetype-resources/src/main/java/TwitterClient.java Wed May 29 19:36:31 2013 +0200
1.3 @@ -3,7 +3,6 @@
1.4 import java.util.Arrays;
1.5 import java.util.List;
1.6 import net.java.html.json.ComputedProperty;
1.7 -import net.java.html.json.Context;
1.8 import net.java.html.json.Function;
1.9 import net.java.html.json.Model;
1.10 import net.java.html.json.OnPropertyChange;
1.11 @@ -91,9 +90,8 @@
1.12 model.queryTweets("http://search.twitter.com", sb.toString());
1.13 }
1.14
1.15 - private static final Context DEFAULT = Context.findDefault(TwitterClient.class);
1.16 static {
1.17 - final TwitterModel model = new TwitterModel(DEFAULT);
1.18 + final TwitterModel model = new TwitterModel();
1.19 final List<Tweeters> svdLst = model.getSavedLists();
1.20 svdLst.add(newTweeters("API Design", "JaroslavTulach"));
1.21 svdLst.add(newTweeters("Celebrities", "JohnCleese", "MCHammer", "StephenFry", "algore", "StevenSanderson"));
1.22 @@ -134,7 +132,7 @@
1.23 final List<Tweeters> sl = model.getSavedLists();
1.24 sl.remove(findByName(sl, model.getActiveTweetersName()));
1.25 if (sl.isEmpty()) {
1.26 - final Tweeters t = new Tweeters(DEFAULT);
1.27 + final Tweeters t = new Tweeters();
1.28 t.setName("New");
1.29 sl.add(t);
1.30 }
1.31 @@ -168,11 +166,11 @@
1.32 return l;
1.33 }
1.34 }
1.35 - return list.isEmpty() ? new Tweeters(DEFAULT) : list.get(0);
1.36 + return list.isEmpty() ? new Tweeters() : list.get(0);
1.37 }
1.38
1.39 private static Tweeters newTweeters(String listName, String... userNames) {
1.40 - Tweeters t = new Tweeters(DEFAULT);
1.41 + Tweeters t = new Tweeters();
1.42 t.setName(listName);
1.43 t.getUserNames().addAll(Arrays.asList(userNames));
1.44 return t;
2.1 --- a/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterClientTest.java Tue May 28 23:06:45 2013 +0200
2.2 +++ b/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterClientTest.java Wed May 29 19:36:31 2013 +0200
2.3 @@ -1,7 +1,8 @@
2.4 package ${package};
2.5
2.6 import java.util.List;
2.7 -import net.java.html.json.Context;
2.8 +import net.java.html.BrwsrCtx;
2.9 +import net.java.html.json.Models;
2.10 import static org.testng.Assert.*;
2.11 import org.testng.annotations.BeforeMethod;
2.12 import org.testng.annotations.Test;
2.13 @@ -14,12 +15,12 @@
2.14
2.15 @BeforeMethod
2.16 public void initModel() {
2.17 - model = new TwitterModel(Context.EMPTY);
2.18 + model = Models.bind(new TwitterModel(), BrwsrCtx.EMPTY);
2.19 }
2.20
2.21 @Test public void testIsValidToAdd() {
2.22 model.setUserNameToAdd("Joe");
2.23 - Tweeters t = new Tweeters(Context.EMPTY);
2.24 + Tweeters t = Models.bind(new Tweeters(), BrwsrCtx.EMPTY);
2.25 t.setName("test");
2.26 model.getSavedLists().add(t);
2.27 model.setActiveTweetersName("test");
3.1 --- a/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterProtocolTest.java Tue May 28 23:06:45 2013 +0200
3.2 +++ b/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterProtocolTest.java Wed May 29 19:36:31 2013 +0200
3.3 @@ -1,6 +1,5 @@
3.4 package ${package};
3.5
3.6 -import net.java.html.json.Context;
3.7 import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
3.8 import org.apidesign.bck2brwsr.vmtest.Http;
3.9 import org.apidesign.bck2brwsr.vmtest.VMTest;
3.10 @@ -53,7 +52,7 @@
3.11 ))
3.12 @BrwsrTest public void readFromTwttr() throws InterruptedException {
3.13 if (page == null) {
3.14 - page = new TwitterModel(Context.findDefault(TwitterProtocolTest.class));
3.15 + page = new TwitterModel();
3.16 page.applyBindings();
3.17 page.queryTweets("", "q=xyz");
3.18 }