Do not return unparametrized array in list

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java
index 9f8336c67408a783024237020d6afe1811e96485..95d35ccf8b0e246b2cd43c00b3ab08edd968cced 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/Function.java
@@ -41,23 +41,23 @@ public abstract class Function {
    * Override this for GQuery methods which loop over matched elements and
    * invoke a callback on each element.
    */
-  public Object f(Element e, int i) {
+  public <W> W f(Element e, int i) {
     Widget w = GQuery.getAssociatedWidget(e);
     if (w != null){
-      return f(w, i);
+      f(w, i);
     } else {
       f((com.google.gwt.user.client.Element)e);
-      return "";
     }
+    return null;
   }
 
   /**
    * Override this for GQuery methods which loop over matched widgets and
    * invoke a callback on each widget.
    */
-  public Object f(Widget w, int i) {
+  public <W> W f(Widget w, int i) {
     f(w.getElement());
-    return "";
+    return null;
   }
   
   /**

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 764720982e97bf2b142359e31acbf20f6986c647..8e756498d7b4a6a59e1f887de62427e0735c9b7a 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
@@ -22,6 +22,7 @@ import static com.google.gwt.query.client.plugins.SimpleNamedQueue.SimpleNamedQu
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
 import java.util.List;\r
+import java.util.Map;\r
 \r
 import com.google.gwt.core.client.GWT;\r
 import com.google.gwt.core.client.JavaScriptObject;\r
@@ -2303,12 +2304,11 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * Pass each element in the current matched set through a function, producing\r
    * a new array containing the return values.\r
    */\r
-  @SuppressWarnings("unchecked")\r
   public <W> List<W> map(Function f) {\r
-    @SuppressWarnings("rawtypes")\r
-    ArrayList ret = new ArrayList();\r
+    ArrayList<W> ret = new ArrayList<W>();\r
     for (int i = 0; i < elements().length; i++) {\r
-      Object o = f.f(elements()[i], i);\r
+      @SuppressWarnings("unchecked")\r
+      W o = (W)f.f(elements()[i], i);\r
       if (o != null) {\r
         ret.add(o);\r
       }\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 db127353f591a5e3266c44f51e87aa4d92c75e27..09774c1aae883ea113d133105232ab6a306cf2cd 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
@@ -20,6 +20,7 @@ import static com.google.gwt.query.client.plugins.SimpleNamedQueue.SimpleNamedQu
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArray;