From 1318f8f90e69757838a98b4219c7932dfd20badf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Maxime=20M=C3=A9riouma-Caron?= Date: Wed, 27 Jan 2016 16:23:56 -0500 Subject: [PATCH] Update for GWT-2.8 --- .../query/client/GQueryJsInteropTestGwt.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryJsInteropTestGwt.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryJsInteropTestGwt.java index a01a9923..44b8fc7d 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryJsInteropTestGwt.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryJsInteropTestGwt.java @@ -19,8 +19,6 @@ import static com.google.gwt.query.client.GQuery.$; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.ScriptInjector; -import com.google.gwt.core.client.js.JsProperty; -import com.google.gwt.core.client.js.JsType; import com.google.gwt.dom.client.Element; import com.google.gwt.junit.DoNotRunWith; import com.google.gwt.junit.Platform; @@ -30,6 +28,9 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.RootPanel; +import jsinterop.annotations.JsProperty; +import jsinterop.annotations.JsType; + /** * Test class for testing jsinterop */ @@ -58,25 +59,26 @@ public class GQueryJsInteropTestGwt extends GWTTestCase { } } - @JsType(prototype = "Window") + @JsType(name = "Window") public interface HTMLWindow { - @JsProperty String getName(); + @JsProperty + String getName(); @JsProperty void setName(String name); } - @JsType(prototype = "Window") + @JsType(name = "Window") public interface HWindow { - @JsProperty HDocument document(); + @JsProperty(name = "document") HDocument document(); } - @JsType(prototype = "HTMLDocument") + @JsType(name = "HTMLDocument") public interface HDocument { HElement createElement(String tag); } - @JsType(prototype = "HTMLElement") + @JsType(name = "HTMLElement") public interface HElement { - @JsProperty void id(String s); + @JsProperty(name = "id") void id(String s); } // jsInterop only works in prod mode. -- 2.39.5