[HtmlUnit] SVN: [14824] trunk/htmlunit/src

[<rb...@us...>]

Revision: 14824
          http://sourceforge.net/p/htmlunit/code/14824
Author:   rbri
Date:     2017-09-10 12:28:24 +0000 (Sun, 10 Sep 2017)
Log Message:
-----------
relax required types

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob2.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java	2017-09-10 11:33:51 UTC (rev 14823)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java	2017-09-10 12:28:24 UTC (rev 14824)
@@ -363,7 +363,7 @@
      * @return the <tt>body</tt> element (or <tt>frameset</tt> element), or {@code null} if it does not yet exist
      */
     public HtmlElement getBody() {
-        final HtmlElement doc = getDocumentElement();
+        final DomElement doc = getDocumentElement();
         if (doc != null) {
             for (final DomNode node : doc.getChildren()) {
                 if (node instanceof HtmlBody || node instanceof HtmlFrameSet) {
@@ -379,7 +379,7 @@
      * @return the head element
      */
     public HtmlElement getHead() {
-        final HtmlElement doc = getDocumentElement();
+        final DomElement doc = getDocumentElement();
         if (doc != null) {
             for (final DomNode node : doc.getChildren()) {
                 if (node instanceof HtmlHead) {
@@ -1217,7 +1217,7 @@
         // Execute the specified event on the document element.
         final WebWindow window = getEnclosingWindow();
         if (window.getScriptableObject() instanceof Window) {
-            final HtmlElement element = getDocumentElement();
+            final DomElement element = getDocumentElement();
             if (element == null) { // happens for instance if document.documentElement has been removed from parent
                 return true;
             }
@@ -1234,7 +1234,7 @@
             }
         }
         if (window.getScriptableObject() instanceof Global) {
-            final HtmlElement element = getDocumentElement();
+            final DomElement element = getDocumentElement();
             if (element == null) { // happens for instance if document.documentElement has been removed from parent
                 return true;
             }
@@ -1503,7 +1503,7 @@
             return;
         }
         if (hasFeature(JS_DEFERRED)) {
-            final HtmlElement doc = getDocumentElement();
+            final DomElement doc = getDocumentElement();
             final List<HtmlElement> elements = doc.getElementsByTagName("script");
             for (final HtmlElement e : elements) {
                 if (e instanceof HtmlScript) {

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob.java	2017-09-10 11:33:51 UTC (rev 14823)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob.java	2017-09-10 12:28:24 UTC (rev 14824)
@@ -15,7 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.background;
 
 import com.gargoylesoftware.htmlunit.WebWindow;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
 import net.sourceforge.htmlunit.corejs.javascript.Function;
@@ -47,7 +47,7 @@
     /** {@inheritDoc} */
     @Override
     protected void runJavaScript(final HtmlPage page) {
-        final HtmlElement doc = page.getDocumentElement();
+        final DomElement doc = page.getDocumentElement();
         final Scriptable scriptable = page.getEnclosingWindow().getScriptableObject();
         page.executeJavaScriptFunction(function_, scriptable, new Object[0], doc);
     }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob2.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob2.java	2017-09-10 11:33:51 UTC (rev 14823)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/background/JavaScriptFunctionJob2.java	2017-09-10 12:28:24 UTC (rev 14824)
@@ -15,7 +15,7 @@
 package com.gargoylesoftware.htmlunit.javascript.background;
 
 import com.gargoylesoftware.htmlunit.WebWindow;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.DomElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.js.nashorn.internal.objects.Global;
 import com.gargoylesoftware.js.nashorn.internal.runtime.Context;
@@ -51,7 +51,7 @@
     /** {@inheritDoc} */
     @Override
     protected void runJavaScript(final HtmlPage page) {
-        final HtmlElement doc = page.getDocumentElement();
+        final DomElement doc = page.getDocumentElement();
         final Global oldGlobal = Context.getGlobal();
         final Global global = page.getEnclosingWindow().getScriptableObject();
         try {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java	2017-09-10 11:33:51 UTC (rev 14823)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java	2017-09-10 12:28:24 UTC (rev 14824)
@@ -886,7 +886,7 @@
             + "</body></html>";
         final HtmlPage page = loadPage(htmlContent);
 
-        final HtmlElement root = page.getDocumentElement();
+        final DomElement root = page.getDocumentElement();
 
         assertNotNull(root);
         assertEquals("html", root.getTagName());
@@ -904,7 +904,7 @@
             + "</body></html>";
         final HtmlPage page = loadPage(htmlContent);
 
-        final HtmlElement root = page.getDocumentElement();
+        final DomElement root = page.getDocumentElement();
 
         assertEquals(org.w3c.dom.Node.DOCUMENT_NODE, page.getNodeType());
         assertEquals(org.w3c.dom.Node.ELEMENT_NODE, root.getNodeType());
@@ -1393,8 +1393,8 @@
         final HtmlPage page = loadPage(content);
         final HtmlPage clone = page.cloneNode(true);
         assertTrue(page != clone);
-        final HtmlElement doc = page.getDocumentElement();
-        final HtmlElement docclone = clone.getDocumentElement();
+        final DomElement doc = page.getDocumentElement();
+        final DomElement docclone = clone.getDocumentElement();
         assertTrue(doc != docclone);
     }