more concrete return values

HtmlUnit · Nov 20, 2024 · dd315d4 · dd315d4
1 parent 2749b3d
commit dd315d4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/src/main/java/org/htmlunit/javascript/host/draganddrop/DataTransferItem.java b/src/main/java/org/htmlunit/javascript/host/draganddrop/DataTransferItem.java
@@ -81,15 +81,15 @@ public void jsConstructor() {
      * @return the {@code type} property
      */
     @JsxGetter
-    public Object getKind() {
+    public String getKind() {
         return kind_;
     }
 
     /**
      * @return the {@code type} property
      */
     @JsxGetter
-    public Object getType() {
+    public String getType() {
         return type_;
     }
 

diff --git a/src/main/java/org/htmlunit/javascript/host/event/Event.java b/src/main/java/org/htmlunit/javascript/host/event/Event.java
@@ -1006,7 +1006,7 @@ public void setReturnValue(final Object newValue) {
      * @return the return composed property
      */
     @JsxGetter
-    public Object getComposed() {
+    public boolean getComposed() {
         return false;
     }
 

diff --git a/src/main/java/org/htmlunit/javascript/host/event/HashChangeEvent.java b/src/main/java/org/htmlunit/javascript/host/event/HashChangeEvent.java
@@ -84,7 +84,7 @@ public void jsConstructor(final String type, final ScriptableObject details) {
      * @return the old URL
      */
     @JsxGetter
-    public Object getOldURL() {
+    public String getOldURL() {
         return oldURL_;
     }
 
@@ -93,7 +93,7 @@ public Object getOldURL() {
      * @return the new URL
      */
     @JsxGetter
-    public Object getNewURL() {
+    public String getNewURL() {
         return newURL_;
     }
 }
diff --git a/src/main/java/org/htmlunit/javascript/host/event/UIEvent.java b/src/main/java/org/htmlunit/javascript/host/event/UIEvent.java
@@ -131,12 +131,12 @@ protected void setDetail(final long detail) {
      * @return the view from which the event was generated
      */
     @JsxGetter
-    public Object getView() {
+    public Window getView() {
         if (view_ == NO_VIEW) {
             return null;
         }
         if (view_ != null) {
-            return view_;
+            return (Window) view_;
         }
         return getWindow();
     }

diff --git a/src/test/java/org/htmlunit/archunit/ArchitectureTest.java b/src/test/java/org/htmlunit/archunit/ArchitectureTest.java
@@ -214,25 +214,18 @@ public boolean test(final JavaClass javaClass) {
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.dom.NodeIterator.getFilter()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.dom.Range.getCommonAncestorContainer()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.dom.TreeWalker.getFilter()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.dom.XPathResult.getNumberValue()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.draganddrop.DataTransferItem.getKind()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.draganddrop.DataTransferItem.getType()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.BeforeUnloadEvent.getReturnValue()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.CustomEvent.getDetail()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.event.Event.getComposed()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.Event.getReturnValue()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.Event.getSrcElement()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.Event.getTarget()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.event.HashChangeEvent.getNewURL()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.event.HashChangeEvent.getOldURL()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.InputEvent.getData()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.InputEvent.getInputType()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.MessageEvent.getData()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.MessageEvent.getPorts()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.PopStateEvent.getState()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.ProgressEvent.getLoaded()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.event.TextEvent.getData()")
-                .and().doNotHaveFullName("org.htmlunit.javascript.host.event.UIEvent.getView()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.file.FileReader.getResult()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.html.HTMLButtonElement.getValue()")
                 .and().doNotHaveFullName("org.htmlunit.javascript.host.html.HTMLDataElement.getValue()")