1.1 --- a/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterClient.java	Wed May 15 09:46:37 2013 +0200
     1.2 +++ b/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterClient.java	Tue Aug 13 21:11:28 2013 +0200
     1.3 @@ -26,7 +26,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 @@ -45,7 +44,7 @@
    1.12      @Property(name="currentTweets", type=Tweet.class, array = true),
    1.13      @Property(name="loading", type=boolean.class)
    1.14  })
    1.15 -public class TwitterClient {
    1.16 +final class TwitterClient {
    1.17      @Model(className = "Tweeters", properties = {
    1.18          @Property(name="name", type = String.class),
    1.19          @Property(name="userNames", type = String.class, array = true)
    1.20 @@ -118,9 +117,8 @@
    1.21          model.queryTweets("http://search.twitter.com", sb.toString());
    1.22      }
    1.23      
    1.24 -    private static final Context DEFAULT = Context.findDefault(TwitterClient.class);
    1.25 -    static {
    1.26 -        final TwitterModel model = new TwitterModel(DEFAULT);
    1.27 +    static void init() {
    1.28 +        final TwitterModel model = new TwitterModel();
    1.29          final List<Tweeters> svdLst = model.getSavedLists();
    1.30          svdLst.add(newTweeters("API Design", "JaroslavTulach"));
    1.31          svdLst.add(newTweeters("Celebrities", "JohnCleese", "MCHammer", "StephenFry", "algore", "StevenSanderson"));
    1.32 @@ -161,7 +159,7 @@
    1.33          final List<Tweeters> sl = model.getSavedLists();
    1.34          sl.remove(findByName(sl, model.getActiveTweetersName()));
    1.35          if (sl.isEmpty()) {
    1.36 -            final Tweeters t = new Tweeters(DEFAULT);
    1.37 +            final Tweeters t = new Tweeters();
    1.38              t.setName("New");
    1.39              sl.add(t);
    1.40          }
    1.41 @@ -195,11 +193,11 @@
    1.42                  return l;
    1.43              }
    1.44          }
    1.45 -        return list.isEmpty() ? new Tweeters(DEFAULT) : list.get(0);
    1.46 +        return list.isEmpty() ? new Tweeters() : list.get(0);
    1.47      }
    1.48      
    1.49      private static Tweeters newTweeters(String listName, String... userNames) {
    1.50 -        Tweeters t = new Tweeters(DEFAULT);
    1.51 +        Tweeters t = new Tweeters();
    1.52          t.setName(listName);
    1.53          t.getUserNames().addAll(Arrays.asList(userNames));
    1.54          return t;