fix tests

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 b32e4ccbc8ff64dff10b6b3437caa8b637b2cbf9..19e7221ff5674b2bf9c26624c4a2fd3173c26951 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
@@ -31,6 +31,8 @@ public abstract class Function {
    * 
    */
   public void cancel(Element e) {
+   // This has to be the order of calls
+    cancel(e.<com.google.gwt.dom.client.Element>cast());
   }
 
   /**
@@ -40,7 +42,6 @@ public abstract class Function {
    * 
    */
   public void cancel(com.google.gwt.dom.client.Element e) {
-    cancel((Element)e);
   }
 
   /**
@@ -59,13 +60,8 @@ public abstract class Function {
    * 
    */
   public Object f(Element e, int i) {
-    Widget w = GQuery.getAssociatedWidget(e);
-    if (w != null){
-      f(w, i);
-    } else {
-      f(e);
-    }
-    return null;
+    // This has to be the order of calls
+    return f(e.<com.google.gwt.dom.client.Element>cast(), i); 
   }
 
   /**
@@ -76,7 +72,13 @@ public abstract class Function {
    * 
    */
   public Object f(com.google.gwt.dom.client.Element e, int i) {
-    return f(e.<Element>cast(), i); 
+    Widget w = GQuery.getAssociatedWidget(e);
+    if (w != null){
+      f(w, i);
+    } else {
+      f(e);
+    }
+    return null;
   }
 
   /**
@@ -115,12 +117,8 @@ public abstract class Function {
    * @param e takes a com.google.gwt.user.client.Element
    */
   public void f(Element e) {
-    Widget w = GQuery.getAssociatedWidget(e);
-    if (w != null){
-      f(w);
-    }else{
-      f();
-    }
+   // This has to be the order of calls
+    f(e.<com.google.gwt.dom.client.Element>cast());
   }
   
   /**
@@ -130,7 +128,12 @@ public abstract class Function {
    * @param e takes a com.google.gwt.dom.client.Element
    */
   public void f(com.google.gwt.dom.client.Element e) {
-   f((Element)e);
+    Widget w = GQuery.getAssociatedWidget(e);
+    if (w != null){
+      f(w);
+    }else{
+      f();
+    }
   }
   
   /**

diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
index b44a839450ffca110906b35bacfab25c872e47ef..b3c6bf94a9c6c899c7e70abaeba6308f6ac48e17 100644 (file)
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryCoreTest.java
@@ -1271,15 +1271,20 @@ public class GQueryCoreTest extends GWTTestCase {
   }
   
   public void testMap() {
-    String html = "<div class='d' id='6'></div><span class='s' id='5'></span><p class='p' id='4'></p><em class='d' id='3'></em><b class='s' id='2'></b><i class='p' id='1'></i><strong></strong>";
+    String html = "<div class='d' id='6'></div>" +
+               "<span class='s' id='5'></span>" +
+               "<p class='p' id='4'></p>" +
+               "<em class='d' id='3'></em>" +
+               "<b class='s' id='2'></b>" +
+               "<i class='p' id='1'></i>" +
+               "<strong></strong>";
     $(e).html(html);
     
     GQuery c = $(e).children();
-    assertEquals(8, c.size());
+    assertEquals(7, c.size());
     
     // A list of lists containing tag,class,id, remove elements without id
     List<List<String>> m = $(e).children().map(new Function() {
-      @SuppressWarnings("unchecked")
       public List<String> f(Element e, int i) {
         // map does not add to the list null elements
         if ($(e).attr("id").isEmpty() || $(e).attr("class").isEmpty()) {