From a045830c6f343492fcf3becd1917f2e0a56a2233 Mon Sep 17 00:00:00 2001
From: Manolo Carrasco <manolo@apache.org>
Date: Thu, 14 Apr 2011 07:14:52 +0000
Subject: [PATCH] Do not return unparametrized array in list

---
 .../java/com/google/gwt/query/client/Function.java     | 10 +++++-----
 .../main/java/com/google/gwt/query/client/GQuery.java  |  8 ++++----
 .../java/com/google/gwt/query/client/LazyGQuery.java   |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

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 9f8336c6..95d35ccf 100644
--- 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 76472098..8e756498 100644
--- 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;
 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;
@@ -2303,12 +2304,11 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
    * Pass each element in the current matched set through a function, producing
    * a new array containing the return values.
    */
-  @SuppressWarnings("unchecked")
   public <W> List<W> map(Function f) {
-    @SuppressWarnings("rawtypes")
-    ArrayList ret = new ArrayList();
+    ArrayList<W> ret = new ArrayList<W>();
     for (int i = 0; i < elements().length; i++) {
-      Object o = f.f(elements()[i], i);
+      @SuppressWarnings("unchecked")
+      W o = (W)f.f(elements()[i], i);
       if (o != null) {
         ret.add(o);
       }
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 db127353..09774c1a 100644
--- 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;
-- 
2.39.5