From 4db5390feb0e5fd43b6132099b09ca791556fe3f Mon Sep 17 00:00:00 2001 From: Zbynek Konecny Date: Mon, 18 Dec 2023 02:09:22 +0100 Subject: [PATCH] Remove usages of JsArray and JavaScriptObject (#27) JavaScriptObject and JsArray are deprecated - internal usages can be replaced with elemental or jsinterop-base, and some API usages can be replaced with Object. --- .../org/gwtproject/dom/client/NodeTest.java | 3 +-- .../org/gwtproject/dom/client/NodeTest.java | 3 +-- .../gwtproject/dom/client/AnchorElement.java | 5 ++--- .../org/gwtproject/dom/client/AreaElement.java | 5 ++--- .../org/gwtproject/dom/client/BRElement.java | 5 ++--- .../org/gwtproject/dom/client/BaseElement.java | 5 ++--- .../org/gwtproject/dom/client/BodyElement.java | 5 ++--- .../gwtproject/dom/client/ButtonElement.java | 5 ++--- .../org/gwtproject/dom/client/DListElement.java | 5 ++--- .../org/gwtproject/dom/client/DivElement.java | 5 ++--- .../java/org/gwtproject/dom/client/Element.java | 4 ++-- .../org/gwtproject/dom/client/EventTarget.java | 2 +- .../gwtproject/dom/client/FieldSetElement.java | 5 ++--- .../org/gwtproject/dom/client/FormElement.java | 5 ++--- .../org/gwtproject/dom/client/FrameElement.java | 5 ++--- .../gwtproject/dom/client/FrameSetElement.java | 5 ++--- .../org/gwtproject/dom/client/HRElement.java | 5 ++--- .../org/gwtproject/dom/client/HeadElement.java | 5 ++--- .../gwtproject/dom/client/HeadingElement.java | 5 ++--- .../gwtproject/dom/client/IFrameElement.java | 5 ++--- .../org/gwtproject/dom/client/ImageElement.java | 5 ++--- .../org/gwtproject/dom/client/InputElement.java | 5 ++--- .../org/gwtproject/dom/client/LIElement.java | 5 ++--- .../org/gwtproject/dom/client/LabelElement.java | 5 ++--- .../gwtproject/dom/client/LegendElement.java | 5 ++--- .../org/gwtproject/dom/client/LinkElement.java | 5 ++--- .../org/gwtproject/dom/client/MapElement.java | 5 ++--- .../org/gwtproject/dom/client/MetaElement.java | 5 ++--- .../org/gwtproject/dom/client/ModElement.java | 5 ++--- .../java/org/gwtproject/dom/client/Node.java | 8 ++++---- .../org/gwtproject/dom/client/OListElement.java | 5 ++--- .../gwtproject/dom/client/ObjectElement.java | 5 ++--- .../gwtproject/dom/client/OptGroupElement.java | 5 ++--- .../gwtproject/dom/client/OptionElement.java | 5 ++--- .../gwtproject/dom/client/ParagraphElement.java | 5 ++--- .../org/gwtproject/dom/client/ParamElement.java | 5 ++--- .../org/gwtproject/dom/client/PreElement.java | 5 ++--- .../org/gwtproject/dom/client/QuoteElement.java | 5 ++--- .../gwtproject/dom/client/ScriptElement.java | 5 ++--- .../gwtproject/dom/client/SelectElement.java | 5 ++--- .../gwtproject/dom/client/SourceElement.java | 5 ++--- .../org/gwtproject/dom/client/SpanElement.java | 5 ++--- .../org/gwtproject/dom/client/StyleElement.java | 5 ++--- .../gwtproject/dom/client/StyleInjector.java | 17 ++++++++--------- .../dom/client/TableCaptionElement.java | 5 ++--- .../gwtproject/dom/client/TableCellElement.java | 5 ++--- .../gwtproject/dom/client/TableColElement.java | 5 ++--- .../org/gwtproject/dom/client/TableElement.java | 5 ++--- .../gwtproject/dom/client/TableRowElement.java | 5 ++--- .../dom/client/TableSectionElement.java | 5 ++--- .../gwtproject/dom/client/TextAreaElement.java | 5 ++--- .../org/gwtproject/dom/client/TitleElement.java | 5 ++--- .../org/gwtproject/dom/client/UListElement.java | 5 ++--- 53 files changed, 111 insertions(+), 161 deletions(-) diff --git a/gwt-dom-gwt2-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java b/gwt-dom-gwt2-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java index 52f6e76..4b1f378 100644 --- a/gwt-dom-gwt2-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java +++ b/gwt-dom-gwt2-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java @@ -19,7 +19,6 @@ import com.google.gwt.junit.Platform; import com.google.gwt.junit.client.GWTTestCase; import java.util.Locale; -import org.gwtproject.core.client.JavaScriptObject; /** Tests the {@link Node} class. */ public class NodeTest extends GWTTestCase { @@ -296,7 +295,7 @@ public void testParentAndSiblings() { public void testIsAndAs() { assertTrue(Node.is(Document.get())); - JavaScriptObject text = Document.get().createTextNode("foo"); + Object text = Document.get().createTextNode("foo"); assertTrue(Node.is(text)); // Node.is(null) is allowed and should return false. diff --git a/gwt-dom-j2cl-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java b/gwt-dom-j2cl-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java index 04a84ba..0354f19 100644 --- a/gwt-dom-j2cl-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java +++ b/gwt-dom-j2cl-tests/src/test/java/org/gwtproject/dom/client/NodeTest.java @@ -18,7 +18,6 @@ import static junit.framework.TestCase.*; import java.util.Locale; -import org.gwtproject.core.client.JavaScriptObject; import org.junit.Test; /** Tests the {@link Node} class. */ @@ -280,7 +279,7 @@ public void testParentAndSiblings() { public void testIsAndAs() { assertTrue(Node.is(Document.get())); - JavaScriptObject text = Document.get().createTextNode("foo"); + Object text = Document.get().createTextNode("foo"); assertTrue(Node.is(text)); // Node.is(null) is allowed and should return false. diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/AnchorElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/AnchorElement.java index ab5fe4c..2651337 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/AnchorElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/AnchorElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.SafeUri; import org.gwtproject.safehtml.shared.annotations.IsSafeUri; @@ -49,14 +48,14 @@ public static AnchorElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/AreaElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/AreaElement.java index 49861d8..e5f0e1a 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/AreaElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/AreaElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Client-side image map area definition. @@ -47,14 +46,14 @@ public static AreaElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/BRElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/BRElement.java index d852314..eb39cab 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/BRElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/BRElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Force a line break. @@ -46,14 +45,14 @@ public static BRElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/BaseElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/BaseElement.java index 1609179..b6451b3 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/BaseElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/BaseElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Document base URI. @@ -47,14 +46,14 @@ public static BaseElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/BodyElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/BodyElement.java index 103ab5f..2de5065 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/BodyElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/BodyElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * The HTML document body. This element is always present in the DOM API, even if the tags are not @@ -47,14 +46,14 @@ public static BodyElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/ButtonElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/ButtonElement.java index 129f0d3..7e5ae7b 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/ButtonElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/ButtonElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * Push button. @@ -49,14 +48,14 @@ public static ButtonElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/DListElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/DListElement.java index 9bd98bf..ee17ea5 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/DListElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/DListElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Definition list. @@ -46,14 +45,14 @@ public static DListElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/DivElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/DivElement.java index 2b757f6..51405c1 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/DivElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/DivElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Generic block container. @@ -46,14 +45,14 @@ public static DivElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/Element.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/Element.java index 46cca36..80932be 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/Element.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/Element.java @@ -83,14 +83,14 @@ public static Element as(Node node) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to an {@link Element}. A + * Determines whether the given object can be cast to an {@link Element}. A * null object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Node.is(o)) { return is((Node) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/EventTarget.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/EventTarget.java index 65c41ab..4c22886 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/EventTarget.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/EventTarget.java @@ -23,7 +23,7 @@ * Represents the target of a JavaScript event. * *

This type is returned from methods such as {@link NativeEvent#getEventTarget()}, and must - * usually be cast to another type using methods such as {@link Element#is(JavaScriptObject)} and + * usually be cast to another type using methods such as {@link Element#is(Object)} and * {@link Element#as(JavaScriptObject)}. * *

This class intentionally does not specify the methods from the DOM IDL diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/FieldSetElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/FieldSetElement.java index bf3e1b3..1d4a581 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/FieldSetElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/FieldSetElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Organizes form controls into logical groups. @@ -48,14 +47,14 @@ public static FieldSetElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/FormElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/FormElement.java index 22b84fb..929e793 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/FormElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/FormElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.SafeUri; import org.gwtproject.safehtml.shared.annotations.IsSafeUri; @@ -50,14 +49,14 @@ public static FormElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameElement.java index 3ce16ca..cee7b1d 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.SafeUri; import org.gwtproject.safehtml.shared.annotations.IsSafeUri; import org.gwtproject.safehtml.shared.annotations.IsTrustedResourceUri; @@ -53,14 +52,14 @@ public static FrameElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameSetElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameSetElement.java index 0c3fd87..d411b52 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameSetElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/FrameSetElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Create a grid of frames. @@ -48,14 +47,14 @@ public static FrameSetElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/HRElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/HRElement.java index 928a9c2..771184c 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/HRElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/HRElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Create a horizontal rule. @@ -46,14 +45,14 @@ public static HRElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadElement.java index 176e0ee..83164f3 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Document head information. @@ -46,14 +45,14 @@ public static HeadElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadingElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadingElement.java index c3d9e38..a20ee71 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadingElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/HeadingElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * For the H1 to H6 elements. @@ -68,14 +67,14 @@ public static HeadingElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/IFrameElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/IFrameElement.java index f41e8f1..eb3ccf8 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/IFrameElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/IFrameElement.java @@ -20,7 +20,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.SafeUri; import org.gwtproject.safehtml.shared.annotations.IsSafeUri; @@ -50,14 +49,14 @@ public static IFrameElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/ImageElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/ImageElement.java index 92d91ff..d0050ca 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/ImageElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/ImageElement.java @@ -20,7 +20,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * Embedded image. @@ -48,14 +47,14 @@ public static ImageElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/InputElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/InputElement.java index b24ca57..49640a0 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/InputElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/InputElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * Form control. @@ -53,14 +52,14 @@ public static InputElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/LIElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/LIElement.java index fac6dfc..4726f0e 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/LIElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/LIElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * List item. @@ -46,14 +45,14 @@ public static LIElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/LabelElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/LabelElement.java index 6d1f5d4..7305774 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/LabelElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/LabelElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Form field label text. @@ -47,14 +46,14 @@ public static LabelElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/LegendElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/LegendElement.java index 900cd8d..bb6fc2a 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/LegendElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/LegendElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Provides a caption for a FIELDSET grouping. @@ -47,14 +46,14 @@ public static LegendElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/LinkElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/LinkElement.java index f268899..0578251 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/LinkElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/LinkElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.annotations.IsTrustedResourceUri; /** @@ -51,14 +50,14 @@ public static LinkElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/MapElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/MapElement.java index 0885d7b..c6c541c 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/MapElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/MapElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Client-side image map. @@ -47,14 +46,14 @@ public static MapElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/MetaElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/MetaElement.java index ffbdecc..0c5f016 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/MetaElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/MetaElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * This contains generic meta-information about the document. @@ -47,14 +46,14 @@ public static MetaElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/ModElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/ModElement.java index 895cab7..03b3dc0 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/ModElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/ModElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.SafeUri; import org.gwtproject.safehtml.shared.annotations.IsSafeUri; @@ -52,14 +51,14 @@ public static ModElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/Node.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/Node.java index fd95abf..1a65902 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/Node.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/Node.java @@ -45,19 +45,19 @@ public class Node extends JavaScriptObject { public static short DOCUMENT_NODE; /** - * Assert that the given {@link JavaScriptObject} is a DOM node and automatically typecast it. + * Assert that the given object is a DOM node and automatically typecast it. * * @param o the object to assert is a Node * @return the object, cast to a Node */ @JsOverlay - public static Node as(JavaScriptObject o) { + public static Node as(Object o) { assert is(o); return (Node) o; } /** - * Determines whether the given {@link JavaScriptObject} is a DOM node. A null object + * Determines whether the given object is a DOM node. A null object * will cause this method to return false. The try catch is needed for the firefox * permission error: "Permission denied to access property 'nodeType'" * @@ -65,7 +65,7 @@ public static Node as(JavaScriptObject o) { * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { try { return Js.isTruthy(o) && Js.isTruthy(Js.asPropertyMap(o).get("nodeType")); } catch (Exception e) { diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/OListElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/OListElement.java index 5b224ab..4154eaa 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/OListElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/OListElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Ordered list. @@ -46,14 +45,14 @@ public static OListElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/ObjectElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/ObjectElement.java index a26750b..f531f0d 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/ObjectElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/ObjectElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.SafeUri; import org.gwtproject.safehtml.shared.annotations.IsTrustedResourceUri; import org.gwtproject.safehtml.shared.annotations.SuppressIsTrustedResourceUriCastCheck; @@ -53,14 +52,14 @@ public static ObjectElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/OptGroupElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/OptGroupElement.java index ef40feb..305f50c 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/OptGroupElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/OptGroupElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * Group options together in logical subdivisions. @@ -50,14 +49,14 @@ public static OptGroupElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/OptionElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/OptionElement.java index 10b53e1..b045256 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/OptionElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/OptionElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * A selectable choice. @@ -49,14 +48,14 @@ public static OptionElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/ParagraphElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/ParagraphElement.java index 487db42..95d624f 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/ParagraphElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/ParagraphElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Paragraphs. @@ -46,14 +45,14 @@ public static ParagraphElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/ParamElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/ParamElement.java index 348545d..a104f6e 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/ParamElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/ParamElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Parameters fed to the OBJECT element. @@ -47,14 +46,14 @@ public static ParamElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/PreElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/PreElement.java index 1c21657..6c8b78f 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/PreElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/PreElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Preformatted text. @@ -46,14 +45,14 @@ public static PreElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/QuoteElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/QuoteElement.java index 09d02e5..a04c474 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/QuoteElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/QuoteElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.SafeUri; import org.gwtproject.safehtml.shared.annotations.IsSafeUri; @@ -50,14 +49,14 @@ public static QuoteElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/ScriptElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/ScriptElement.java index f610331..f2341ee 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/ScriptElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/ScriptElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; import org.gwtproject.safehtml.shared.annotations.IsTrustedResourceUri; /** @@ -49,14 +48,14 @@ public static ScriptElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/SelectElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/SelectElement.java index 4967790..9ae7339 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/SelectElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/SelectElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * The select element allows the selection of an option. @@ -51,14 +50,14 @@ public static SelectElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/SourceElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/SourceElement.java index e886c8f..3dfd119 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/SourceElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/SourceElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * The SOURCE element specifies one of potentially multiple source file in a media element. @@ -47,14 +46,14 @@ public static SourceElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/SpanElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/SpanElement.java index 2e8963f..b03d38c 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/SpanElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/SpanElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Generic inline container. @@ -46,14 +45,14 @@ public static SpanElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleElement.java index 4cc3f2f..6b3043b 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * Style information. @@ -53,14 +52,14 @@ public static StyleElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleInjector.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleInjector.java index 52f6cd9..a63d68c 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleInjector.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/StyleInjector.java @@ -15,8 +15,7 @@ */ package org.gwtproject.dom.client; -import org.gwtproject.core.client.JavaScriptObject; -import org.gwtproject.core.client.JsArrayString; +import elemental2.core.JsArray; import org.gwtproject.core.client.Scheduler; import org.gwtproject.core.client.Scheduler.ScheduledCommand; @@ -29,9 +28,9 @@ public class StyleInjector { private static HeadElement head; - private static final JsArrayString toInject = JavaScriptObject.createArray().cast(); - private static final JsArrayString toInjectAtEnd = JavaScriptObject.createArray().cast(); - private static final JsArrayString toInjectAtStart = JavaScriptObject.createArray().cast(); + private static final JsArray toInject = new JsArray<>(); + private static final JsArray toInjectAtEnd = new JsArray<>(); + private static final JsArray toInjectAtStart = new JsArray<>(); private static ScheduledCommand flusher = new ScheduledCommand() { @@ -173,11 +172,11 @@ public static void setContents(StyleElement style, String contents) { } /** The which parameter is used to support the injectStylesheet API. */ - private static StyleElement flush(JavaScriptObject which) { + private static StyleElement flush(JsArray which) { StyleElement toReturn = null; StyleElement maybeReturn; - if (toInjectAtStart.length() != 0) { + if (toInjectAtStart.length != 0) { String css = toInjectAtStart.join(""); maybeReturn = injectStyleSheetAtStart(css); if (toInjectAtStart == which) { @@ -186,7 +185,7 @@ private static StyleElement flush(JavaScriptObject which) { toInjectAtStart.setLength(0); } - if (toInject.length() != 0) { + if (toInject.length != 0) { String css = toInject.join(""); maybeReturn = injectStyleSheet(css); if (toInject == which) { @@ -195,7 +194,7 @@ private static StyleElement flush(JavaScriptObject which) { toInject.setLength(0); } - if (toInjectAtEnd.length() != 0) { + if (toInjectAtEnd.length != 0) { String css = toInjectAtEnd.join(""); maybeReturn = injectStyleSheetAtEnd(css); if (toInjectAtEnd == which) { diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCaptionElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCaptionElement.java index 682e296..d0c138a 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCaptionElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCaptionElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Table caption. @@ -46,14 +45,14 @@ public static TableCaptionElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCellElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCellElement.java index 05e221a..2eddaac 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCellElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableCellElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * The object used to represent the TH and TD elements. @@ -48,14 +47,14 @@ public static TableCellElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableColElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableColElement.java index f0647cc..522c5f0 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableColElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableColElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Regroups the COL and COLGROUP elements. @@ -48,14 +47,14 @@ public static TableColElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableElement.java index 711a24f..c51edb4 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * The create* and delete* methods on the table allow authors to construct and modify tables. [HTML @@ -50,14 +49,14 @@ public static TableElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableRowElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableRowElement.java index ba6d83d..2c3b567 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableRowElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableRowElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * A row in a table. @@ -47,14 +46,14 @@ public static TableRowElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableSectionElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableSectionElement.java index 762eaa5..4f26d39 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TableSectionElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TableSectionElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** The THEAD, TFOOT, and TBODY elements. */ @JsType(isNative = true, name = "Object", namespace = JsPackage.GLOBAL) @@ -53,14 +52,14 @@ public static TableSectionElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TextAreaElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TextAreaElement.java index 615533a..0b193ce 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TextAreaElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TextAreaElement.java @@ -21,7 +21,6 @@ import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; import jsinterop.base.Js; -import org.gwtproject.core.client.JavaScriptObject; /** * Multi-line text field. @@ -50,14 +49,14 @@ public static TextAreaElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/TitleElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/TitleElement.java index 813dfdf..691120f 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/TitleElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/TitleElement.java @@ -19,7 +19,6 @@ import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * The document title. @@ -47,14 +46,14 @@ public static TitleElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); } diff --git a/gwt-dom/src/main/java/org/gwtproject/dom/client/UListElement.java b/gwt-dom/src/main/java/org/gwtproject/dom/client/UListElement.java index fad2eee..61084f7 100644 --- a/gwt-dom/src/main/java/org/gwtproject/dom/client/UListElement.java +++ b/gwt-dom/src/main/java/org/gwtproject/dom/client/UListElement.java @@ -18,7 +18,6 @@ import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; -import org.gwtproject.core.client.JavaScriptObject; /** * Unordered list. @@ -46,14 +45,14 @@ public static UListElement as(Element elem) { } /** - * Determines whether the given {@link JavaScriptObject} can be cast to this class. A null + * Determines whether the given object can be cast to this class. A null * object will cause this method to return false. * * @param o the object to check if it is an instance of this type * @return true of the object is an instance of this type, false otherwise */ @JsOverlay - public static boolean is(JavaScriptObject o) { + public static boolean is(Object o) { if (Element.is(o)) { return is((Element) o); }