# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1369848991 -7200
# Node ID 345274016cb9fd8b151a9b2be24ee1b1c4876003
# Parent  cba2fc5c544b9f37efd14827e3f26026d2de7902
Replacing Context in archetype

diff -r cba2fc5c544b -r 345274016cb9 ko-archetype/src/main/resources/archetype-resources/src/main/java/TwitterClient.java
--- a/ko-archetype/src/main/resources/archetype-resources/src/main/java/TwitterClient.java	Tue May 28 23:06:45 2013 +0200
+++ b/ko-archetype/src/main/resources/archetype-resources/src/main/java/TwitterClient.java	Wed May 29 19:36:31 2013 +0200
@@ -3,7 +3,6 @@
 import java.util.Arrays;
 import java.util.List;
 import net.java.html.json.ComputedProperty;
-import net.java.html.json.Context;
 import net.java.html.json.Function;
 import net.java.html.json.Model;
 import net.java.html.json.OnPropertyChange;
@@ -91,9 +90,8 @@
         model.queryTweets("http://search.twitter.com", sb.toString());
     }
     
-    private static final Context DEFAULT = Context.findDefault(TwitterClient.class);
     static {
-        final TwitterModel model = new TwitterModel(DEFAULT);
+        final TwitterModel model = new TwitterModel();
         final List<Tweeters> svdLst = model.getSavedLists();
         svdLst.add(newTweeters("API Design", "JaroslavTulach"));
         svdLst.add(newTweeters("Celebrities", "JohnCleese", "MCHammer", "StephenFry", "algore", "StevenSanderson"));
@@ -134,7 +132,7 @@
         final List<Tweeters> sl = model.getSavedLists();
         sl.remove(findByName(sl, model.getActiveTweetersName()));
         if (sl.isEmpty()) {
-            final Tweeters t = new Tweeters(DEFAULT);
+            final Tweeters t = new Tweeters();
             t.setName("New");
             sl.add(t);
         }
@@ -168,11 +166,11 @@
                 return l;
             }
         }
-        return list.isEmpty() ? new Tweeters(DEFAULT) : list.get(0);
+        return list.isEmpty() ? new Tweeters() : list.get(0);
     }
     
     private static Tweeters newTweeters(String listName, String... userNames) {
-        Tweeters t = new Tweeters(DEFAULT);
+        Tweeters t = new Tweeters();
         t.setName(listName);
         t.getUserNames().addAll(Arrays.asList(userNames));
         return t;
diff -r cba2fc5c544b -r 345274016cb9 ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterClientTest.java
--- a/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterClientTest.java	Tue May 28 23:06:45 2013 +0200
+++ b/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterClientTest.java	Wed May 29 19:36:31 2013 +0200
@@ -1,7 +1,8 @@
 package ${package};
 
 import java.util.List;
-import net.java.html.json.Context;
+import net.java.html.BrwsrCtx;
+import net.java.html.json.Models;
 import static org.testng.Assert.*;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -14,12 +15,12 @@
 
     @BeforeMethod
     public void initModel() {
-        model = new TwitterModel(Context.EMPTY);
+        model = Models.bind(new TwitterModel(), BrwsrCtx.EMPTY);
     }
 
     @Test public void testIsValidToAdd() {
         model.setUserNameToAdd("Joe");
-        Tweeters t = new Tweeters(Context.EMPTY);
+        Tweeters t = Models.bind(new Tweeters(), BrwsrCtx.EMPTY);
         t.setName("test");
         model.getSavedLists().add(t);
         model.setActiveTweetersName("test");
diff -r cba2fc5c544b -r 345274016cb9 ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterProtocolTest.java
--- a/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterProtocolTest.java	Tue May 28 23:06:45 2013 +0200
+++ b/ko-archetype/src/main/resources/archetype-resources/src/test/java/TwitterProtocolTest.java	Wed May 29 19:36:31 2013 +0200
@@ -1,6 +1,5 @@
 package ${package};
 
-import net.java.html.json.Context;
 import org.apidesign.bck2brwsr.vmtest.BrwsrTest;
 import org.apidesign.bck2brwsr.vmtest.Http;
 import org.apidesign.bck2brwsr.vmtest.VMTest;
@@ -53,7 +52,7 @@
     ))
     @BrwsrTest public void readFromTwttr() throws InterruptedException {
         if (page == null) {
-            page = new TwitterModel(Context.findDefault(TwitterProtocolTest.class));
+            page = new TwitterModel();
             page.applyBindings();
             page.queryTweets("", "q=xyz");
         }