Rename class

diff --git a/jsquery/src/main/java/gwtquery/jsquery/client/JsMenu.java b/jsquery/src/main/java/gwtquery/jsquery/client/JsMenu.java
index 7051a7118115d53cfd7919cbe4f9b91d454a314b..1312cc550972a63b1ece44c9632f456bf1af3f77 100644 (file)
--- a/jsquery/src/main/java/gwtquery/jsquery/client/JsMenu.java
+++ b/jsquery/src/main/java/gwtquery/jsquery/client/JsMenu.java
@@ -3,7 +3,7 @@ package gwtquery.jsquery.client;
 public abstract class JsMenu {
   
   public static native void loadPlugin() /*-{
-  var l = @gwtquery.jsquery.client.utils.JsQAux::log(Ljava/lang/Object;);
+  var l = @gwtquery.jsquery.client.utils.JsQueryUtils::log(Ljava/lang/Object;);
   var window = $wnd;
   var document = $doc;
   var jQuery = $wnd.$;

diff --git a/jsquery/src/main/java/gwtquery/jsquery/client/JsQuery.java b/jsquery/src/main/java/gwtquery/jsquery/client/JsQuery.java
index 2180b5bbf2d7905b482db71772601c8084195ba8..ad15715a37beb3f1ad10f08a313eb6deda62db94 100644 (file)
--- a/jsquery/src/main/java/gwtquery/jsquery/client/JsQuery.java
+++ b/jsquery/src/main/java/gwtquery/jsquery/client/JsQuery.java
@@ -26,7 +26,7 @@ public class JsQuery implements EntryPoint {
   }
   
   private native static void testJs() /*-{
-    var l = @gwtquery.jsquery.client.utils.JsQAux::log(Ljava/lang/Object;);
+    var l = @gwtquery.jsquery.client.utils.JsQueryUtils::log(Ljava/lang/Object;);
     l($.each);
     $.each(["a","b"], function(a, b){
       l("kk " + " " + a + " " + b);

diff --git a/jsquery/src/main/java/gwtquery/jsquery/client/OverlayGQuery.java b/jsquery/src/main/java/gwtquery/jsquery/client/OverlayGQuery.java
index 8515883cb444d2250cea89dee2bfc88ad53d93cb..4708212f5205322f168a029660d36a5bfcaa923f 100644 (file)
--- a/jsquery/src/main/java/gwtquery/jsquery/client/OverlayGQuery.java
+++ b/jsquery/src/main/java/gwtquery/jsquery/client/OverlayGQuery.java
@@ -1,6 +1,6 @@
 package gwtquery.jsquery.client;
 
-import gwtquery.jsquery.client.utils.JsQAux;
+import gwtquery.jsquery.client.utils.JsQueryUtils;
 
 import org.timepedia.exporter.client.Export;
 import org.timepedia.exporter.client.ExportAfterCreateMethod;
@@ -84,7 +84,7 @@ public class OverlayGQuery implements ExportOverlay<GQuery> {
   
   @ExportStaticMethod("$wnd.$")
   public static GQuery $(Object o) {
-    return JsQAux.dollar(o);
+    return JsQueryUtils.dollar(o);
   }
 
   @ExportStaticMethod("$wnd.$")
@@ -94,17 +94,17 @@ public class OverlayGQuery implements ExportOverlay<GQuery> {
   
   @ExportStaticMethod("$wnd.$.extend")
   public static JavaScriptObject extend(Object...objs) {
-    return JsQAux.extend(objs);
+    return JsQueryUtils.extend(objs);
   }
 
   @ExportStaticMethod("$wnd.$.each")
   public static JavaScriptObject[] each(JavaScriptObject[] objs, Function f) {
-    return JsQAux.each(objs, f);
+    return JsQueryUtils.each(objs, f);
   }
   
   @ExportStaticMethod("$wnd.$.inArray")
   public static int inArray(Object o, Object arr) {
-    return JsQAux.inArray(o, arr);
+    return JsQueryUtils.inArray(o, arr);
   }
   
   @ExportInstanceMethod

diff --git a/jsquery/src/main/java/gwtquery/jsquery/client/utils/JsQAux.java b/jsquery/src/main/java/gwtquery/jsquery/client/utils/JsQAux.java
deleted file mode 100644 (file)
index a474864..0000000
--- a/jsquery/src/main/java/gwtquery/jsquery/client/utils/JsQAux.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package gwtquery.jsquery.client.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.dom.client.Element;
-import com.google.gwt.dom.client.Node;
-import com.google.gwt.query.client.Function;
-import com.google.gwt.query.client.GQuery;
-import com.google.gwt.query.client.js.JsCache;
-import com.google.gwt.query.client.js.JsNodeArray;
-import com.google.gwt.query.client.js.JsUtils;
-
-public abstract class JsQAux {
-
-  private native static String dumpObject(JavaScriptObject o) /*-{
-               var s = "";
-               for (k in o)
-                       s += " " + k;
-               return s;
-  }-*/;
-
-  private static native void runJsFunction(JavaScriptObject f) /*-{
-               f();
-  }-*/;
-
-  public static GQuery dollar(Object o) {
-    if (o instanceof String) {
-      return GQuery.$((String) o);
-    } else if (o instanceof JavaScriptObject) {
-      JavaScriptObject jso = (JavaScriptObject) o;
-      if (JsUtils.isFunction(jso)) {
-        runJsFunction(jso);
-      } else {
-        GQuery r = GQuery.$(jso);
-        if (JsUtils.isArray(jso)) {
-          JsCache c = jso.cast();
-          JsNodeArray elms = JsNodeArray.create();
-          for (int i = 0; i < c.length(); i++) {
-            Object obj = c.get(i);
-            if (obj instanceof Node) {
-              elms.addNode((Node) obj);
-            }
-          }
-          r = GQuery.$(elms);
-        }
-        return r;
-      }
-    }
-    return GQuery.$();
-  }
-
-  public static GQuery dollar(String s, Element ctx) {
-    return GQuery.$(s, ctx);
-  }
-
-  public static void ready(Function f) {
-    f.f();
-  }
-  
-  public static int inArray(Object object, Object array) {
-    if (array instanceof List) {
-       return ((List)array).indexOf(object);
-    } else if (object instanceof JavaScriptObject
-        && JsUtils.isElement((JavaScriptObject) object)) {
-      return dollar(array).index((Element) object);
-    } else if (array instanceof JavaScriptObject
-        && JsUtils.isArray((JavaScriptObject) array)) {
-      return ((JsCache) array).indexOf(object);
-    }
-    return -1;
-  }
-
-  public static JavaScriptObject extend(Object... objs) {
-    int i = 0, l = objs.length;
-    boolean deep = false;
-    JavaScriptObject ctx = null;
-    Object target = objs[i];
-    if (target instanceof Boolean) {
-      deep = (Boolean) target;
-      if (l == 1)
-        return ctx;
-      target = objs[i++];
-    }
-    if (l - i == 1) {
-      i--;
-    } else {
-      ctx = (JavaScriptObject) target;
-    }
-
-    for (++i; i < l; i++) {
-      if (objs[i] != null) {
-        ctx = extendImpl(deep, ctx, objs[i]);
-      }
-    }
-    return ctx;
-  }
-
-  private static native JavaScriptObject getDefaultPrototype() /*-{
-               return $wnd.jsQuery && $wnd.jsQuery.fn ? $wnd.jsQuery.fn.prototype
-                               : null;
-  }-*/;
-
-  private static native JavaScriptObject extendImpl(boolean deep,
-      JavaScriptObject ctx, Object s) /*-{
-               var d = ctx ? ctx : $wnd.jsQuery.fn.prototype || {};
-               for (k in s) {
-                       d[k] = s[k];
-                       if (!ctx)
-                               $wnd.$[k] = s[k];
-               }
-               return d;
-  }-*/;
-  
-  public static JavaScriptObject[] each(JavaScriptObject[] objs, Function f) {
-    ArrayList<Object> ret = new ArrayList<Object>();
-    for (Object o : objs) {
-      f.setDataObject(o);
-      if (f.fe(null, o)) {
-        ret.add(o);
-      }
-    }
-    return ret.toArray(new JavaScriptObject[0]);
-  }
-
-  public static void log(Object l) {
-    System.out.println(l);
-  }
-
-}

diff --git a/jsquery/src/main/java/gwtquery/jsquery/client/utils/JsQueryUtils.java b/jsquery/src/main/java/gwtquery/jsquery/client/utils/JsQueryUtils.java
new file mode 100644 (file)
index 0000000..5025f61
--- /dev/null
+++ b/jsquery/src/main/java/gwtquery/jsquery/client/utils/JsQueryUtils.java
@@ -0,0 +1,134 @@
+package gwtquery.jsquery.client.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.dom.client.Node;
+import com.google.gwt.query.client.Function;
+import com.google.gwt.query.client.GQuery;
+import com.google.gwt.query.client.js.JsCache;
+import com.google.gwt.query.client.js.JsNodeArray;
+import com.google.gwt.query.client.js.JsUtils;
+
+/**
+ * These are a set of utility methods needed in jsquery because
+ * either they are not in the GQuery core yet, or they are already
+ * there but we need to modify their behavior. 
+ * Most of them should be moved to the GQuery core api.
+ *
+ */
+public abstract class JsQueryUtils {
+
+  private native static String dumpObject(JavaScriptObject o) /*-{
+               var s = "";
+               for (k in o)
+                       s += " " + k;
+               return s;
+  }-*/;
+
+  public static GQuery dollar(Object o) {
+    if (o instanceof String) {
+      return GQuery.$((String) o);
+    } else if (o instanceof JavaScriptObject) {
+      JavaScriptObject jso = (JavaScriptObject) o;
+      if (JsUtils.isFunction(jso)) {
+        new JsUtils.JsFunction(jso).fe();
+      } else {
+        GQuery r = GQuery.$(jso);
+        if (JsUtils.isArray(jso)) {
+          JsCache c = jso.cast();
+          JsNodeArray elms = JsNodeArray.create();
+          for (int i = 0; i < c.length(); i++) {
+            Object obj = c.get(i);
+            if (obj instanceof Node) {
+              elms.addNode((Node) obj);
+            }
+          }
+          r = GQuery.$(elms);
+        }
+        return r;
+      }
+    }
+    return GQuery.$();
+  }
+
+  public static GQuery dollar(String s, Element ctx) {
+    return GQuery.$(s, ctx);
+  }
+
+  public static void ready(Function f) {
+    f.f();
+  }
+  
+  public static int inArray(Object object, Object array) {
+    if (array instanceof List) {
+       return ((List)array).indexOf(object);
+    } else if (object instanceof JavaScriptObject
+        && JsUtils.isElement((JavaScriptObject) object)) {
+      return dollar(array).index((Element) object);
+    } else if (array instanceof JavaScriptObject
+        && JsUtils.isArray((JavaScriptObject) array)) {
+      return ((JsCache) array).indexOf(object);
+    }
+    return -1;
+  }
+
+  public static JavaScriptObject extend(Object... objs) {
+    int i = 0, l = objs.length;
+    boolean deep = false;
+    JavaScriptObject ctx = null;
+    Object target = objs[i];
+    if (target instanceof Boolean) {
+      deep = (Boolean) target;
+      if (l == 1)
+        return ctx;
+      target = objs[i++];
+    }
+    if (l - i == 1) {
+      i--;
+    } else {
+      ctx = (JavaScriptObject) target;
+    }
+
+    for (++i; i < l; i++) {
+      if (objs[i] != null) {
+        ctx = extendImpl(deep, ctx, objs[i]);
+      }
+    }
+    return ctx;
+  }
+
+  private static native JavaScriptObject getDefaultPrototype() /*-{
+               return $wnd.jsQuery && $wnd.jsQuery.fn ? $wnd.jsQuery.fn.prototype
+                               : null;
+  }-*/;
+
+  private static native JavaScriptObject extendImpl(boolean deep,
+      JavaScriptObject ctx, Object s) /*-{
+               var d = ctx ? ctx : $wnd.jsQuery.fn.prototype || {};
+               for (k in s) {
+                       d[k] = s[k];
+                       if (!ctx)
+                               $wnd.$[k] = s[k];
+               }
+               return d;
+  }-*/;
+  
+  public static JavaScriptObject[] each(JavaScriptObject[] objs, Function f) {
+    ArrayList<Object> ret = new ArrayList<Object>();
+    for (Object o : objs) {
+      f.setDataObject(o);
+      if (f.fe(null, o)) {
+        ret.add(o);
+      }
+    }
+    return ret.toArray(new JavaScriptObject[0]);
+  }
+
+  public static void log(Object l) {
+    System.out.println(l);
+  }
+
+}