1.1 --- a/javaquery/api/pom.xml Mon Apr 15 20:47:42 2013 +0200
1.2 +++ b/javaquery/api/pom.xml Mon Apr 15 21:56:56 2013 +0200
1.3 @@ -80,5 +80,11 @@
1.4 <scope>system</scope>
1.5 <systemPath>${java.home}/lib/jfxrt.jar</systemPath>
1.6 </dependency>
1.7 + <dependency>
1.8 + <groupId>org.json</groupId>
1.9 + <artifactId>json</artifactId>
1.10 + <version>20090211</version>
1.11 + <type>jar</type>
1.12 + </dependency>
1.13 </dependencies>
1.14 </project>
2.1 --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java Mon Apr 15 20:47:42 2013 +0200
2.2 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java Mon Apr 15 21:56:56 2013 +0200
2.3 @@ -17,14 +17,31 @@
2.4 */
2.5 package org.apidesign.bck2brwsr.htmlpage;
2.6
2.7 +import java.io.IOException;
2.8 +import java.io.InputStream;
2.9 +import java.io.InputStreamReader;
2.10 +import java.io.PushbackInputStream;
2.11 +import java.io.Reader;
2.12 +import java.net.URL;
2.13 +import java.util.Iterator;
2.14 +import java.util.concurrent.Executor;
2.15 +import java.util.concurrent.Executors;
2.16 +import java.util.logging.Level;
2.17 +import java.util.logging.Logger;
2.18 +import javafx.application.Platform;
2.19 import netscape.javascript.JSObject;
2.20 import org.apidesign.bck2brwsr.core.JavaScriptBody;
2.21 +import org.json.JSONArray;
2.22 +import org.json.JSONException;
2.23 +import org.json.JSONObject;
2.24 +import org.json.JSONTokener;
2.25
2.26 /**
2.27 *
2.28 * @author Jaroslav Tulach <jtulach@netbeans.org>
2.29 */
2.30 public final class ConvertTypes {
2.31 + private static final Logger LOG = Logger.getLogger(ConvertTypes.class.getName());
2.32 ConvertTypes() {
2.33 }
2.34
2.35 @@ -90,59 +107,84 @@
2.36 }
2.37
2.38 public static String createJSONP(Object[] jsonResult, Runnable whenDone) {
2.39 - int h = whenDone.hashCode();
2.40 - String name;
2.41 - for (;;) {
2.42 - name = "jsonp" + Integer.toHexString(h);
2.43 - if (defineIfUnused(name, jsonResult, whenDone)) {
2.44 - return name;
2.45 - }
2.46 - h++;
2.47 - }
2.48 + return "json" + Integer.toHexString(whenDone.hashCode());
2.49 }
2.50
2.51 - @JavaScriptBody(args = { "name", "arr", "run" }, body =
2.52 - "if (window[name]) return false;\n "
2.53 - + "window[name] = function(data) {\n "
2.54 - + " delete window[name];\n"
2.55 - + " var el = window.document.getElementById(name);\n"
2.56 - + " el.parentNode.removeChild(el);\n"
2.57 - + " arr[0] = data;\n"
2.58 - + " run.run__V();\n"
2.59 - + "};\n"
2.60 - + "return true;\n"
2.61 - )
2.62 - private static boolean defineIfUnused(String name, Object[] arr, Runnable run) {
2.63 - return true;
2.64 - }
2.65 -
2.66 - @JavaScriptBody(args = { "url", "arr", "callback" }, body = ""
2.67 - + "var request = new XMLHttpRequest();\n"
2.68 - + "request.open('GET', url, true);\n"
2.69 - + "request.setRequestHeader('Content-Type', 'application/json; charset=utf-8');\n"
2.70 - + "request.onreadystatechange = function() {\n"
2.71 - + " if (this.readyState!==4) return;\n"
2.72 - + " try {\n"
2.73 - + " arr[0] = eval('(' + this.response + ')');\n"
2.74 - + " } catch (error) {;\n"
2.75 - + " throw 'Cannot parse' + error + ':' + this.response;\n"
2.76 - + " };\n"
2.77 - + " callback.run__V();\n"
2.78 - + "};"
2.79 - + "request.send();"
2.80 - )
2.81 - private static void loadJSON(
2.82 - String url, Object[] jsonResult, Runnable whenDone
2.83 - ) {
2.84 - }
2.85 -
2.86 public static void loadJSON(
2.87 String url, Object[] jsonResult, Runnable whenDone, String jsonp
2.88 ) {
2.89 - if (jsonp == null) {
2.90 - loadJSON(url, jsonResult, whenDone);
2.91 - } else {
2.92 - loadJSONP(url, jsonp);
2.93 + REQ.execute(new LoadJSON(url, jsonResult, whenDone, jsonp));
2.94 + }
2.95 +
2.96 + private static final Executor REQ = Executors.newCachedThreadPool();
2.97 + private static final class LoadJSON implements Runnable {
2.98 +
2.99 + private final String url;
2.100 + private final Object[] jsonResult;
2.101 + private final Runnable whenDone;
2.102 + private final String jsonp;
2.103 +
2.104 + LoadJSON(String url, Object[] jsonResult, Runnable whenDone, String jsonp) {
2.105 + this.url = url;
2.106 + this.jsonResult = jsonResult;
2.107 + this.whenDone = whenDone;
2.108 + this.jsonp = jsonp;
2.109 + }
2.110 +
2.111 + @Override
2.112 + public void run() {
2.113 + if (Platform.isFxApplicationThread()) {
2.114 + whenDone.run();
2.115 + return;
2.116 + }
2.117 + try {
2.118 + URL u = new URL(url.replace(" ", "%20"));
2.119 + InputStream is = u.openStream();
2.120 + if (jsonp != null) {
2.121 + PushbackInputStream pis = new PushbackInputStream(is, 1);
2.122 + is = pis;
2.123 + for (;;) {
2.124 + int ch = pis.read();
2.125 + if (ch == -1) {
2.126 + break;
2.127 + }
2.128 + if (ch == '{') {
2.129 + pis.unread(ch);
2.130 + break;
2.131 + }
2.132 + }
2.133 + }
2.134 + Reader r = new InputStreamReader(is, "UTF-8");
2.135 +
2.136 + JSONTokener tok = new JSONTokener(r);
2.137 + JSONObject obj = new JSONObject(tok);
2.138 + jsonResult[0] = convertToArray(obj);
2.139 + } catch (JSONException | IOException ex) {
2.140 + jsonResult[0] = ex;
2.141 + } finally {
2.142 + Platform.runLater(this);
2.143 + }
2.144 + }
2.145 +
2.146 + private static Object convertToArray(Object o) throws JSONException {
2.147 + if (o instanceof JSONArray) {
2.148 + JSONArray ja = (JSONArray)o;
2.149 + Object[] arr = new Object[ja.length()];
2.150 + for (int i = 0; i < arr.length; i++) {
2.151 + arr[i] = convertToArray(ja.get(i));
2.152 + }
2.153 + return arr;
2.154 + } else if (o instanceof JSONObject) {
2.155 + JSONObject obj = (JSONObject)o;
2.156 + Iterator it = obj.keys();
2.157 + while (it.hasNext()) {
2.158 + String key = (String)it.next();
2.159 + obj.put(key, convertToArray(obj.get(key)));
2.160 + }
2.161 + return obj;
2.162 + } else {
2.163 + return o;
2.164 + }
2.165 }
2.166 }
2.167
2.168 @@ -159,9 +201,18 @@
2.169 }
2.170
2.171 public static void extractJSON(Object jsonObject, String[] props, Object[] values) {
2.172 - for (int i = 0; i < props.length; i++) {
2.173 - values[i] = getProperty(jsonObject, props[i]);
2.174 + if (jsonObject instanceof JSONObject) {
2.175 + JSONObject obj = (JSONObject)jsonObject;
2.176 + for (int i = 0; i < props.length; i++) {
2.177 + try {
2.178 + values[i] = obj.get(props[i]);
2.179 + } catch (JSONException ex) {
2.180 + LOG.log(Level.SEVERE, "Can't read " + props[i] + " from " + jsonObject, ex);
2.181 + }
2.182 + }
2.183 +
2.184 }
2.185 +
2.186 }
2.187
2.188 }
3.1 --- a/javaquery/demo-twitter/src/main/java/org/apidesign/bck2brwsr/demo/twitter/TwitterClient.java Mon Apr 15 20:47:42 2013 +0200
3.2 +++ b/javaquery/demo-twitter/src/main/java/org/apidesign/bck2brwsr/demo/twitter/TwitterClient.java Mon Apr 15 21:56:56 2013 +0200
3.3 @@ -103,7 +103,9 @@
3.4 sb.append(p);
3.5 sep = " OR ";
3.6 }
3.7 - model.queryTweets("http://search.twitter.com", sb.toString());
3.8 + if (!sep.isEmpty()) {
3.9 + model.queryTweets("http://search.twitter.com", sb.toString());
3.10 + }
3.11 }
3.12
3.13 static {