# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1371727090 -7200
# Node ID 7ff8ac49cd8ca7b1ccbb97d8b2bca1f796f8d87d
# Parent  65cadba2cf022ec4af3916f6637df666a859c47f
Rewriting to be Grizzly independent and also ajusting to Twitter's removal of 1.0 APIs

diff -r 65cadba2cf02 -r 7ff8ac49cd8c twitter/nbactions.xml
--- a/twitter/nbactions.xml	Mon May 20 12:45:50 2013 +0200
+++ b/twitter/nbactions.xml	Thu Jun 20 13:18:10 2013 +0200
@@ -23,23 +23,34 @@
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
--->
-<actions>
-    <action>
-        <actionName>run</actionName>
-        <goals>
-            <goal>process-classes</goal>
-            <goal>bck2brwsr:brwsr</goal>
-        </goals>
-    </action>
-    <action>
-        <actionName>debug</actionName>
-        <goals>
-            <goal>process-classes</goal>
-            <goal>bck2brwsr:brwsr</goal>
-        </goals>
-        <properties>
-            <jpda.listen>maven</jpda.listen>
-        </properties>
-    </action>
+--><actions>
+        <action>
+            <actionName>debug</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.apidesign.html.demo.twitter.TwitterMain</exec.args>
+                <exec.executable>java</exec.executable>
+                <jpda.listen>true</jpda.listen>
+            </properties>
+        </action>
+        <action>
+            <actionName>run</actionName>
+            <packagings>
+                <packaging>jar</packaging>
+            </packagings>
+            <goals>
+                <goal>process-classes</goal>
+                <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
+            </goals>
+            <properties>
+                <exec.args>-classpath %classpath org.apidesign.html.demo.twitter.TwitterMain</exec.args>
+                <exec.executable>java</exec.executable>
+            </properties>
+        </action>
 </actions>
diff -r 65cadba2cf02 -r 7ff8ac49cd8c twitter/pom.xml
--- a/twitter/pom.xml	Mon May 20 12:45:50 2013 +0200
+++ b/twitter/pom.xml	Thu Jun 20 13:18:10 2013 +0200
@@ -20,8 +20,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <net.java.html.version>0.1</net.java.html.version>
-    <bck2brwsr.version>0.7</bck2brwsr.version>
+    <net.java.html.version>0.4-SNAPSHOT</net.java.html.version>
+    <bck2brwsr.version>0.8-SNAPSHOT</bck2brwsr.version>
     <bck2brwsr.obfuscationlevel>MINIMAL</bck2brwsr.obfuscationlevel>
     <brwsr.startpage>org/apidesign/html/demo/twitter/index.html</brwsr.startpage>
   </properties>
@@ -121,6 +121,12 @@
       <version>${net.java.html.version}</version>
       <type>jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.apidesign.html</groupId>
+      <artifactId>boot-fx</artifactId>
+      <version>0.4-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
   <profiles>
       <profile>
@@ -140,7 +146,7 @@
                     <configuration>
                         <archive>
                             <manifest>
-                                <mainClass>org.apidesign.bck2brwsr.launcher.FXBrwsrLauncher</mainClass>
+                                <mainClass>org.apidesign.html.demo.twitter.TwitterMain</mainClass>
                                 <addClasspath>true</addClasspath>
                                 <classpathPrefix>lib/</classpathPrefix>
                             </manifest>
diff -r 65cadba2cf02 -r 7ff8ac49cd8c twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterClient.java
--- a/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterClient.java	Mon May 20 12:45:50 2013 +0200
+++ b/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterClient.java	Thu Jun 20 13:18:10 2013 +0200
@@ -26,7 +26,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;
@@ -52,14 +51,28 @@
     })
     static class Twttrs {
     }
+    @Model(className = "User", properties = {
+        @Property(name = "name", type = String.class),
+        @Property(name = "profile_image_url", type = String.class),
+        @Property(name = "id", type = int.class)
+    })
+    static class Usr {
+    }
     @Model(className = "Tweet", properties = {
-        @Property(name = "from_user", type = String.class),
-        @Property(name = "from_user_id", type = int.class),
+        @Property(name = "user", type = User.class),
         @Property(name = "profile_image_url", type = String.class),
         @Property(name = "text", type = String.class),
         @Property(name = "created_at", type = String.class),
     })
     static final class Twt {
+        @ComputedProperty static String from_user(User user) {
+            return user != null ? user.getName() : null;
+        }
+        
+        @ComputedProperty static String imageUrl(User user) {
+            return user != null ? user.getProfile_image_url() : null;
+        }
+        
         @ComputedProperty static String html(String text) {
             StringBuilder sb = new StringBuilder(320);
             for (int pos = 0;;) {
@@ -79,20 +92,20 @@
             }
         }
         
-        @ComputedProperty static String userUrl(String from_user) {
-            return "http://twitter.com/" + from_user;
+        @ComputedProperty static String userUrl(User user) {
+            return "http://twitter.com/" + user.getName();
         }
     }
     @Model(className = "TwitterQuery", properties = {
-        @Property(array = true, name = "results", type = Twt.class)
+        @Property(array = true, name = "statuses", type = Twt.class)
     })
     public static final class TwttrQr {
     }
     
-    @OnReceive(url="{root}/search.json?{query}&callback={me}", jsonp="me")
+    @OnReceive(url="{url}?{query}&callback={me}", jsonp="me")
     static void queryTweets(TwitterModel page, TwitterQuery q) {
         page.getCurrentTweets().clear();
-        page.getCurrentTweets().addAll(q.getResults());
+        page.getCurrentTweets().addAll(q.getStatuses());
         page.setLoading(false);
     }
     
@@ -106,26 +119,37 @@
     @OnPropertyChange({ "activeTweeters", "activeTweetersCount" })
     static void refreshTweets(TwitterModel model) {
         StringBuilder sb = new StringBuilder();
-        sb.append("rpp=25&q=");
+        sb.append("users=");
         String sep = "";
         for (String p : model.getActiveTweeters()) {
             sb.append(sep);
-            sb.append("from:");
             sb.append(p);
-            sep = " OR ";
+            sep = "%7C";
+        }
+        if (sep.isEmpty()) {
+            return;
         }
         model.setLoading(true);
-        model.queryTweets("http://search.twitter.com", sb.toString());
+        model.queryTweets("http://services.netbeans.org/synergy/server/api/twitter.php", sb.toString());
     }
     
-    private static final Context DEFAULT = Context.findDefault(TwitterClient.class);
     static {
-        final TwitterModel model = new TwitterModel(DEFAULT);
+        try {
+            init();
+        } catch (Throwable ex) {
+            ex.printStackTrace();
+        }
+    }
+    private static void init() {
+        System.setProperty("http.proxyHost", "www-proxy.uk.oracle.com");
+        System.setProperty("http.proxyPort", "80");
+        
+        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"));
         svdLst.add(newTweeters("Microsoft people", "BillGates", "shanselman", "ScottGu"));
-        svdLst.add(newTweeters("NetBeans", "GeertjanW","monacotoni", "NetBeans", "petrjiricka"));
+        svdLst.add(newTweeters("NetBeans", "GeertjanW","monacotoni", "NetBeans", "petrjiricka", "ladariha"));
         svdLst.add(newTweeters("Tech pundits", "Scobleizer", "LeoLaporte", "techcrunch", "BoingBoing", "timoreilly", "codinghorror"));
 
         model.setActiveTweetersName("NetBeans");
@@ -161,7 +185,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);
         }
@@ -195,11 +219,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 65cadba2cf02 -r 7ff8ac49cd8c twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterMain.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterMain.java	Thu Jun 20 13:18:10 2013 +0200
@@ -0,0 +1,19 @@
+package org.apidesign.html.demo.twitter;
+
+import net.java.html.boot.BrowserBuilder;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class TwitterMain {
+    private TwitterMain() {
+    }
+    
+    public static void main(String... args) {
+        BrowserBuilder.newBrowser().
+            loadClass(TwitterClient.class).
+            loadPage("index.html").
+            showAndWait();
+    }
+}
diff -r 65cadba2cf02 -r 7ff8ac49cd8c twitter/src/main/resources/org/apidesign/html/demo/twitter/index.html
--- a/twitter/src/main/resources/org/apidesign/html/demo/twitter/index.html	Mon May 20 12:45:50 2013 +0200
+++ b/twitter/src/main/resources/org/apidesign/html/demo/twitter/index.html	Thu Jun 20 13:18:10 2013 +0200
@@ -83,7 +83,7 @@
                 <div class='loadingIndicator' data-bind="visible: loading">Loading...</div>
                 <table data-bind='foreach: currentTweets' width='100%'>
                     <tr>
-                        <td><img data-bind='attr: { src: profile_image_url }' /></td>
+                        <td><img data-bind='attr: { src: imageUrl }' /></td>
                         <td>
                             <a class='twitterUser' data-bind='attr: { href: userUrl }, text: from_user'> </a>
                             <span data-bind='html: html'> </span>
@@ -93,13 +93,5 @@
                 </table>
             </div>
         </div>
-        
-        <script src="bck2brwsr.js"></script>
-        <script type="text/javascript">
-            var vm = bck2brwsr('demo-twitter-1.0-SNAPSHOT.jar');
-            vm.loadClass('org.apidesign.html.demo.twitter.TwitterClient');
-        </script>
-
-
     </body>
 </html>