changes in r409 override

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
index 77ae23d4063ed1e883f9e200b1e24f71c4882f6a..b3e599b10622a43c5234eeba99c95f648b04af4e 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
@@ -50,7 +50,6 @@ import com.google.gwt.user.client.ui.Widget;
 \r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
-import java.util.Collection;\r
 import java.util.HashMap;\r
 import java.util.List;\r
 \r
@@ -198,35 +197,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
     return new GQuery(JSArray.create());\r
   }\r
 \r
-  /**\r
-   * Create a new GQuery given a list of objects. Only node objects will be\r
-   * added;\r
-   */\r
-  public static GQuery $(@SuppressWarnings("rawtypes") ArrayList a) {\r
-    JSArray elements = JSArray.create();\r
-    if (a != null) {\r
-      for (Object o : a) {\r
-        if (o instanceof Node) {\r
-          elements.addNode((Node) o);\r
-        } else if (o instanceof Widget) {\r
-          elements.addNode(((Widget) o).getElement());\r
-        }\r
-      }\r
-    }\r
-    return new GQuery(elements);\r
-  }\r
-\r
-  /**\r
-   * Wrap a GQuery around a collection of existing widget.\r
-   */\r
-  public static GQuery $(Collection<Widget> widgetList) {\r
-    JSArray elements = JSArray.create();\r
-    for (Widget w : widgetList) {\r
-      elements.addNode(w.getElement());\r
-    }\r
-    return $(elements);\r
-  }\r
-\r
+ \r
   /**\r
    * Wrap a GQuery around an existing element.\r
    */\r
@@ -255,6 +226,24 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
   public static GQuery $(NodeList<Element> elements) {\r
     return new GQuery(elements);\r
   }\r
+  \r
+  /**\r
+   * Create a new GQuery given a list of nodes, elements or widgets \r
+   */\r
+  public static GQuery $(List<?> nodesOrWidgets) {\r
+    JSArray elements = JSArray.create();\r
+    if (nodesOrWidgets != null) {\r
+      for (Object o : nodesOrWidgets ) {\r
+        if (o instanceof Node) {\r
+          elements.addNode((Node)o);\r
+        } else if (o instanceof Widget) {\r
+          elements.addNode(((Widget)o).getElement());\r
+        }\r
+      }\r
+    }\r
+    return new GQuery(elements);\r
+  }\r
+\r
 \r
   /**\r
    * This function accepts a string containing a CSS selector which is then used\r
@@ -348,30 +337,12 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
   }\r
 \r
   /**\r
-   * Wrap a GQuery around an existing widget.\r
+   * Wrap a GQuery around one widget or an array of existing ones.\r
    */\r
-  public static GQuery $(Widget w) {\r
-    return w == null ? $() : $(w.getElement());\r
-  }\r
-\r
-  /**\r
-   * Wrap a GQuery around a array of existing widget.\r
-   */\r
-  public static <T extends Widget> GQuery $(T... widgets) {\r
+  public static GQuery $(Widget... widgets){\r
     return $(Arrays.asList(widgets));\r
   }\r
 \r
-  /**\r
-   * Wrap a GQuery around a List of existing widget.\r
-   */\r
-  public static <T extends Widget> GQuery $(List<T> widgets) {\r
-    JSArray elements = JSArray.create();\r
-    for (Widget w : widgets) {\r
-      elements.addNode(w.getElement());\r
-    }\r
-    return $(elements);\r
-  }\r
-\r
   /**\r
    * Wrap a JSON object.\r
    */\r
@@ -1628,7 +1599,7 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * a new array containing the return values.\r
    */\r
   @SuppressWarnings("unchecked")\r
-  public <W> ArrayList<W> map(Function f) {\r
+  public <W> List<W> map(Function f) {\r
     @SuppressWarnings("rawtypes")\r
     ArrayList ret = new ArrayList();\r
     for (int i = 0; i < elements().length; i++) {\r

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java
index 5bfec35b175ae699bf2b8206780736f5471db1ab..88abf286a85f2f30fc0c70eb4979d90f05922012 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/LazyGQuery.java
@@ -47,7 +47,6 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Widget;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import com.google.gwt.query.client.LazyBase;
@@ -715,7 +714,7 @@ public interface LazyGQuery<T> extends LazyBase<T>{
    * Pass each element in the current matched set through a function, producing
    * a new array containing the return values.
    */
-  <W> ArrayList<W> map(Function f);
+  <W> List<W> map(Function f);
 
   /**
    * Bind a set of functions to the mousedown event of each matched element. Or