time to remove IE (issue #735)

Author: rbri

src/main/java/org/htmlunit/BrowserVersionFeatures.java

@@ -18,7 +18,6 @@
 import static org.htmlunit.javascript.configuration.SupportedBrowser.EDGE;
 import static org.htmlunit.javascript.configuration.SupportedBrowser.FF;
 import static org.htmlunit.javascript.configuration.SupportedBrowser.FF_ESR;
-import static org.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import org.htmlunit.javascript.configuration.BrowserFeature;
 
@@ -201,14 +200,6 @@ public enum BrowserVersionFeatures {
     @BrowserFeature({CHROME, EDGE})
     HTML_COMMAND_TAG,
 
-    /** HTML parser supports the 'isindex' tag. */
-    @BrowserFeature(IE)
-    HTML_ISINDEX_TAG,
-
-    /** HTML parser supports the 'main' tag. */
-    @BrowserFeature(IE)
-    HTML_MAIN_TAG,
-
     /** Additionally support dates in format "d/M/yyyy". */
     @BrowserFeature({FF, FF_ESR})
     HTTP_COOKIE_EXTENDED_DATE_PATTERNS_1,
@@ -319,10 +310,6 @@ public enum BrowserVersionFeatures {
     @BrowserFeature({FF, FF_ESR})
     JS_FORM_DISPATCHEVENT_SUBMITS,
 
-    /** Support for document.formName('inputName'). */
-    @BrowserFeature(IE)
-    JS_FORM_USABLE_AS_FUNCTION,
-
     /** HTMLObject Validity isValid ignores custom error property. */
     @BrowserFeature({CHROME, EDGE})
     JS_HTML_OBJECT_VALIDITYSTATE_ISVALID_IGNORES_CUSTOM_ERROR,

src/main/java/org/htmlunit/html/parser/neko/HtmlUnitNekoDOMBuilder.java

@@ -15,8 +15,6 @@
 package org.htmlunit.html.parser.neko;
 
 import static org.htmlunit.BrowserVersionFeatures.HTML_COMMAND_TAG;
-import static org.htmlunit.BrowserVersionFeatures.HTML_ISINDEX_TAG;
-import static org.htmlunit.BrowserVersionFeatures.HTML_MAIN_TAG;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -27,7 +25,6 @@
 import java.util.Locale;
 
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.tuple.Triple;
 import org.htmlunit.BrowserVersion;
 import org.htmlunit.ObjectInstantiationException;
 import org.htmlunit.WebClient;
@@ -37,7 +34,6 @@
 import org.htmlunit.cyberneko.HTMLEventInfo;
 import org.htmlunit.cyberneko.HTMLScanner;
 import org.htmlunit.cyberneko.HTMLTagBalancingListener;
-import org.htmlunit.cyberneko.util.FastHashMap;
 import org.htmlunit.cyberneko.xerces.parsers.AbstractSAXParser;
 import org.htmlunit.cyberneko.xerces.xni.Augmentations;
 import org.htmlunit.cyberneko.xerces.xni.QName;
@@ -102,86 +98,32 @@ final class HtmlUnitNekoDOMBuilder extends AbstractSAXParser
         implements ContentHandler, LexicalHandler, HTMLTagBalancingListener, HTMLParserDOMBuilder {
 
     // cache Neko Elements for performance and memory efficiency
-    private static final FastHashMap<Triple<Boolean, Boolean, Boolean>, HTMLElements>
-                HTMLELEMENTS_CACHE = new FastHashMap<>();
+    private static final HTMLElements HTMLELEMENTS;
+    private static final HTMLElements HTMLELEMENTS_WITH_CMD;
 
     static {
         // continue short code enumeration
         final short isIndexShortCode = HTMLElements.UNKNOWN + 1;
-
         final short commandShortCode = isIndexShortCode + 1;
-        final short mainShortCode = commandShortCode + 1;
 
         // isIndex is special - we have to add it here because all browsers moving this to
         // the body (even if it is not supported)
         final HTMLElements.Element isIndex = new HTMLElements.Element(isIndexShortCode, "ISINDEX",
                 HTMLElements.Element.CONTAINER, HTMLElements.BODY, null);
-        final HTMLElements.Element isIndexSupported = new HTMLElements.Element(isIndexShortCode, "ISINDEX",
-                HTMLElements.Element.BLOCK, HTMLElements.BODY, new short[] {isIndexShortCode});
 
         final HTMLElements.Element command = new HTMLElements.Element(commandShortCode, "COMMAND",
                 HTMLElements.Element.EMPTY, new short[] {HTMLElements.BODY, HTMLElements.HEAD}, null);
-        final HTMLElements.Element main = new HTMLElements.Element(mainShortCode, "MAIN",
-                HTMLElements.Element.INLINE, HTMLElements.BODY, null);
 
-        Triple<Boolean, Boolean, Boolean> key;
         HTMLElements value;
 
-        // !COMMAND_TAG !ISINDEX_TAG !MAIN_TAG
-        key = Triple.of(Boolean.FALSE, Boolean.FALSE, Boolean.FALSE);
         value = new HTMLElements();
         value.setElement(isIndex);
-        HTMLELEMENTS_CACHE.put(key, value);
-
-        // !COMMAND_TAG !ISINDEX_TAG MAIN_TAG
-        key = Triple.of(Boolean.FALSE, Boolean.FALSE, Boolean.TRUE);
-        value = new HTMLElements();
-        value.setElement(main);
-        value.setElement(isIndex);
-        HTMLELEMENTS_CACHE.put(key, value);
-
-        // !COMMAND_TAG ISINDEX_TAG !MAIN_TAG
-        key = Triple.of(Boolean.FALSE, Boolean.TRUE, Boolean.FALSE);
-        value = new HTMLElements();
-        value.setElement(isIndexSupported);
-        HTMLELEMENTS_CACHE.put(key, value);
-
-        // !COMMAND_TAG ISINDEX_TAG MAIN_TAG
-        key = Triple.of(Boolean.FALSE, Boolean.TRUE, Boolean.TRUE);
-        value = new HTMLElements();
-        value.setElement(isIndexSupported);
-        value.setElement(main);
-        HTMLELEMENTS_CACHE.put(key, value);
+        HTMLELEMENTS = value;
 
-        // COMMAND_TAG !ISINDEX_TAG !MAIN_TAG
-        key = Triple.of(Boolean.TRUE, Boolean.FALSE, Boolean.FALSE);
         value = new HTMLElements();
         value.setElement(command);
         value.setElement(isIndex);
-        HTMLELEMENTS_CACHE.put(key, value);
-
-        // COMMAND_TAG !ISINDEX_TAG MAIN_TAG
-        key = Triple.of(Boolean.TRUE, Boolean.FALSE, Boolean.TRUE);
-        value = new HTMLElements();
-        value.setElement(command);
-        value.setElement(isIndex);
-        value.setElement(main);
-        HTMLELEMENTS_CACHE.put(key, value);
-
-        // COMMAND_TAG ISINDEX_TAG !MAIN_TAG
-        key = Triple.of(Boolean.TRUE, Boolean.TRUE, Boolean.FALSE);
-        value = new HTMLElements();
-        value.setElement(command);
-        value.setElement(isIndexSupported);
-        HTMLELEMENTS_CACHE.put(key, value);
-
-        // COMMAND_TAG ISINDEX_TAG MAIN_TAG
-        key = Triple.of(Boolean.TRUE, Boolean.TRUE, Boolean.TRUE);
-        value = new HTMLElements();
-        value.setElement(command);
-        value.setElement(isIndexSupported);
-        value.setElement(main);
-        HTMLELEMENTS_CACHE.put(key, value);
+        HTMLELEMENTS_WITH_CMD = value;
     }
 
     private enum HeadParsed { YES, SYNTHESIZED, NO }
@@ -276,11 +218,10 @@ public void pushInputString(final String html) {
      * @return the configuration
      */
     private static XMLParserConfiguration createConfiguration(final BrowserVersion browserVersion) {
-        final HTMLElements elements = HTMLELEMENTS_CACHE.get(
-                Triple.of(browserVersion.hasFeature(HTML_COMMAND_TAG),
-                        browserVersion.hasFeature(HTML_ISINDEX_TAG),
-                        browserVersion.hasFeature(HTML_MAIN_TAG)));
-        return new HTMLConfiguration(elements);
+        if (browserVersion.hasFeature(HTML_COMMAND_TAG)) {
+            return new HTMLConfiguration(HTMLELEMENTS_WITH_CMD);
+        }
+        return new HTMLConfiguration(HTMLELEMENTS);
     }
 
     /**

src/main/java/org/htmlunit/javascript/host/Location.java

@@ -15,7 +15,6 @@
 package org.htmlunit.javascript.host;
 
 import static org.htmlunit.BrowserVersionFeatures.JS_LOCATION_RELOAD_REFERRER;
-import static org.htmlunit.javascript.configuration.SupportedBrowser.IE;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -35,9 +34,6 @@
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
-import org.htmlunit.javascript.configuration.JsxFunction;
-import org.htmlunit.javascript.configuration.JsxGetter;
-import org.htmlunit.javascript.configuration.JsxSetter;
 import org.htmlunit.javascript.host.event.Event;
 import org.htmlunit.javascript.host.event.HashChangeEvent;
 import org.htmlunit.protocol.javascript.JavaScriptURLConnection;
@@ -214,7 +210,6 @@ public Object getDefaultValue(final Class<?> hint) {
      * @throws IOException if loading the specified location fails
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms536342.aspx">MSDN Documentation</a>
      */
-    @JsxFunction(IE)
     public void assign(final String url) throws IOException {
         setHref(url);
     }
@@ -226,7 +221,6 @@ public void assign(final String url) throws IOException {
      * @throws IOException if there is a problem reloading the page
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms536342.aspx">MSDN Documentation</a>
      */
-    @JsxFunction(IE)
     public void reload(final boolean force) throws IOException {
         final WebWindow webWindow = window_.getWebWindow();
         final HtmlPage htmlPage = (HtmlPage) webWindow.getEnclosedPage();
@@ -245,7 +239,6 @@ public void reload(final boolean force) throws IOException {
      * @throws IOException if loading the specified location fails
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms536712.aspx">MSDN Documentation</a>
      */
-    @JsxFunction(IE)
     public void replace(final String url) throws IOException {
         window_.getWebWindow().getHistory().removeCurrent();
         setHref(url);
@@ -255,7 +248,6 @@ public void replace(final String url) throws IOException {
      * Returns the location URL.
      * @return the location URL
      */
-    @JsxFunction(functionName = "toString", value = IE)
     public String jsToString() {
         if (window_ != null) {
             return getHref();
@@ -268,7 +260,6 @@ public String jsToString() {
      * @return the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533867.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getHref() {
         final WebWindow webWindow = window_.getWebWindow();
         final Page page = webWindow.getEnclosedPage();
@@ -303,7 +294,6 @@ public String getHref() {
      * @throws IOException if loading the specified location fails
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533867.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setHref(final String newLocation) throws IOException {
         WebWindow webWindow = getWindow(getStartingScope()).getWebWindow();
         final HtmlPage page = (HtmlPage) webWindow.getEnclosedPage();
@@ -341,7 +331,6 @@ public void setHref(final String newLocation) throws IOException {
      * @return the search portion of the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534620.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getSearch() {
         final String search = getUrl().getQuery();
         if (search == null) {
@@ -356,7 +345,6 @@ public String getSearch() {
      * @throws Exception if an error occurs
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534620.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setSearch(final String search) throws Exception {
         setUrl(UrlUtils.getUrlWithNewQuery(getUrl(), search));
     }
@@ -366,7 +354,6 @@ public void setSearch(final String search) throws Exception {
      * @return the hash portion of the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533775.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getHash() {
         String hash = hash_;
 
@@ -400,7 +387,6 @@ private String getHash(final boolean encoded) {
      * @param hash the new hash portion of the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533775.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setHash(final String hash) {
         // IMPORTANT: This method must not call setUrl(), because
         // we must not hit the server just to change the hash!
@@ -454,7 +440,6 @@ private static String decodeHash(final String hash) {
      * @return the hostname portion of the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533785.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getHostname() {
         return getUrl().getHost();
     }
@@ -465,7 +450,6 @@ public String getHostname() {
      * @throws Exception if an error occurs
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533785.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setHostname(final String hostname) throws Exception {
         setUrl(UrlUtils.getUrlWithNewHost(getUrl(), hostname));
     }
@@ -475,7 +459,6 @@ public void setHostname(final String hostname) throws Exception {
      * @return the host portion of the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533784.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getHost() {
         final URL url = getUrl();
         final int port = url.getPort();
@@ -493,7 +476,6 @@ public String getHost() {
      * @throws Exception if an error occurs
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms533784.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setHost(final String host) throws Exception {
         final String hostname;
         final int port;
@@ -515,7 +497,6 @@ public void setHost(final String host) throws Exception {
      * @return the pathname portion of the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534332.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getPathname() {
         if (UrlUtils.URL_ABOUT_BLANK == getUrl()) {
             return "blank";
@@ -529,7 +510,6 @@ public String getPathname() {
      * @throws Exception if an error occurs
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534332.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setPathname(final String pathname) throws Exception {
         setUrl(UrlUtils.getUrlWithNewPath(getUrl(), pathname));
     }
@@ -539,7 +519,6 @@ public void setPathname(final String pathname) throws Exception {
      * @return the port portion of the location URL
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534342.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getPort() {
         final int port = getUrl().getPort();
         if (port == -1) {
@@ -554,7 +533,6 @@ public String getPort() {
      * @throws Exception if an error occurs
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534342.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setPort(final String port) throws Exception {
         setUrl(UrlUtils.getUrlWithNewPort(getUrl(), Integer.parseInt(port)));
     }
@@ -564,7 +542,6 @@ public void setPort(final String port) throws Exception {
      * @return the protocol portion of the location URL, including the trailing ':'
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534353.aspx">MSDN Documentation</a>
      */
-    @JsxGetter(IE)
     public String getProtocol() {
         return getUrl().getProtocol() + ":";
     }
@@ -575,7 +552,6 @@ public String getProtocol() {
      * @throws Exception if an error occurs
      * @see <a href="http://msdn.microsoft.com/en-us/library/ms534353.aspx">MSDN Documentation</a>
      */
-    @JsxSetter(IE)
     public void setProtocol(final String protocol) throws Exception {
         setUrl(UrlUtils.getUrlWithNewProtocol(getUrl(), protocol));
     }
@@ -609,7 +585,6 @@ private void setUrl(final URL url) throws IOException {
      * Returns the {@code origin} property.
      * @return the {@code origin} property
      */
-    @JsxGetter(IE)
     public String getOrigin() {
         return getUrl().getProtocol() + "://" + getHost();
     }

src/main/java/org/htmlunit/javascript/host/css/CSSStyleDeclaration.java

@@ -1749,7 +1749,7 @@ public void setRight(final Object right) {
      * Gets the {@code rubyAlign} style attribute.
      * @return the style attribute
      */
-    @JsxGetter({IE, FF, FF_ESR})
+    @JsxGetter({FF, FF_ESR})
     public String getRubyAlign() {
         if (styleDeclaration_ == null) {
             return null; // prototype
@@ -1761,7 +1761,7 @@ public String getRubyAlign() {
      * Sets the {@code rubyAlign} style attribute.
      * @param rubyAlign the new attribute
      */
-    @JsxSetter({IE, FF, FF_ESR})
+    @JsxSetter({FF, FF_ESR})
     public void setRubyAlign(final String rubyAlign) {
         setStyleAttribute(Definition.RUBY_ALIGN.getAttributeName(), rubyAlign);
     }

src/main/java/org/htmlunit/javascript/host/dom/Document.java

@@ -1951,7 +1951,7 @@ private static Date parseDateOrNow(final String stringDate) {
     /**
      * Mock for the moment.
      */
-    @JsxFunction({FF, FF_ESR, IE})
+    @JsxFunction({FF, FF_ESR})
     public void releaseCapture() {
     }