diff -r 7a7686e6f875 -r 6dc2c6c752df javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java Thu Apr 18 17:28:34 2013 +0200 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java Thu Apr 18 23:09:30 2013 +0200 @@ -42,7 +42,6 @@ * @author Jaroslav Tulach */ public final class ConvertTypes { - private static final Logger LOG = Logger.getLogger(ConvertTypes.class.getName()); ConvertTypes() { } @@ -123,14 +122,16 @@ return "json" + Integer.toHexString(whenDone.hashCode()); } + @JavaScriptBody(args = { "url", "jsonResult", "whenDone", "jsonp" }, body = "throw 'ignore';") public static void loadJSON( String url, Object[] jsonResult, Runnable whenDone, String jsonp ) { - REQ.execute(new LoadJSON(url, jsonResult, whenDone, jsonp)); + LoadJSON.REQ.execute(new LoadJSON(url, jsonResult, whenDone, jsonp)); } - private static final Executor REQ = Executors.newCachedThreadPool(); private static final class LoadJSON implements Runnable { + static final Executor REQ = Executors.newCachedThreadPool(); + private static final Logger LOG = Logger.getLogger(ConvertTypes.class.getName()); private final String url; private final Object[] jsonResult; @@ -230,7 +231,8 @@ private static void loadJSONP(String url, String jsonp) { } - + + @JavaScriptBody(args = { "jsonObject", "props", "values" }, body = "throw 'ignore extractJSON';") public static void extractJSON(Object jsonObject, String[] props, Object[] values) { if (jsonObject instanceof JSONObject) { JSONObject obj = (JSONObject)jsonObject; @@ -238,7 +240,7 @@ try { values[i] = obj.has(props[i]) ? obj.get(props[i]) : null; } catch (JSONException ex) { - LOG.log(Level.SEVERE, "Can't read " + props[i] + " from " + jsonObject, ex); + LoadJSON.LOG.log(Level.SEVERE, "Can't read " + props[i] + " from " + jsonObject, ex); } }