From: Manolo Carrasco <manolo@apache.org>
Date: Mon, 20 Jan 2014 08:18:20 +0000 (+0100)
Subject: merge
X-Git-Tag: gwtquery-project-1.4.3~44^2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a6e942e71cdf9111544f9c6551c87112af6171c4;p=gwtquery.git

merge
---

a6e942e71cdf9111544f9c6551c87112af6171c4
diff --cc gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryAjaxTestGwt.java
index 188e516e,65bd8c56..ee35efa2
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryAjaxTestGwt.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryAjaxTestGwt.java
@@@ -26,7 -24,8 +26,6 @@@ import com.google.gwt.junit.client.GWTT
  import com.google.gwt.query.client.builders.Name;
  import com.google.gwt.query.client.builders.XmlBuilder;
  import com.google.gwt.query.client.plugins.ajax.Ajax;
--import com.google.gwt.query.client.plugins.ajax.Ajax.Settings;
  import com.google.gwt.user.client.ui.HTML;
  import com.google.gwt.user.client.ui.RootPanel;
  
@@@ -173,7 -265,7 +172,7 @@@ public class GQueryAjaxTestGwt extends 
      String testJsonpUrl = "http://www.google.com";
      Ajax.getJSONP(testJsonpUrl, null, new Function(){
        public void f() {
--        Properties p = getDataProperties();
++        Properties p = arguments(0);
          assertNull(p);
          finishTest();
        }