remove HTMLListElement and fix class tree

Author: rbri

src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java

@@ -279,7 +279,6 @@
 import org.htmlunit.javascript.host.html.HTMLLabelElement;
 import org.htmlunit.javascript.host.html.HTMLLegendElement;
 import org.htmlunit.javascript.host.html.HTMLLinkElement;
-import org.htmlunit.javascript.host.html.HTMLListElement;
 import org.htmlunit.javascript.host.html.HTMLMapElement;
 import org.htmlunit.javascript.host.html.HTMLMarqueeElement;
 import org.htmlunit.javascript.host.html.HTMLMediaElement;
@@ -648,7 +647,7 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
         HTMLFormElement.class, HTMLFrameElement.class, HTMLFrameSetElement.class, HTMLHRElement.class,
         HTMLHeadElement.class, HTMLHeadingElement.class, HTMLHtmlElement.class, HTMLIFrameElement.class,
         HTMLImageElement.class, HTMLInputElement.class, HTMLLIElement.class, HTMLLabelElement.class,
-        HTMLLegendElement.class, HTMLLinkElement.class, HTMLListElement.class, HTMLMapElement.class,
+        HTMLLegendElement.class, HTMLLinkElement.class, HTMLMapElement.class,
         HTMLMarqueeElement.class, HTMLMediaElement.class, HTMLMetaElement.class, HTMLMeterElement.class,
         HTMLModElement.class, HTMLObjectElement.class, HTMLOptGroupElement.class, HTMLOptionElement.class,
         HTMLOutputElement.class, HTMLParagraphElement.class, HTMLParamElement.class, HTMLPictureElement.class,

src/main/java/org/htmlunit/javascript/host/html/HTMLDListElement.java

@@ -15,8 +15,11 @@
 package org.htmlunit.javascript.host.html;
 
 import org.htmlunit.html.HtmlDefinitionList;
+import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
+import org.htmlunit.javascript.configuration.JsxGetter;
+import org.htmlunit.javascript.configuration.JsxSetter;
 
 /**
  * The JavaScript object {@code HTMLDListElement}.
@@ -25,7 +28,7 @@
  * @author Ronald Brill
  */
 @JsxClass(domClass = HtmlDefinitionList.class)
-public class HTMLDListElement extends HTMLListElement {
+public class HTMLDListElement extends HTMLElement {
 
     /**
      * JavaScript constructor.
@@ -35,4 +38,27 @@ public class HTMLDListElement extends HTMLListElement {
     public void jsConstructor() {
         super.jsConstructor();
     }
+
+    /**
+     * Returns the value of the {@code compact} attribute.
+     * @return the value of the {@code compact} attribute
+     */
+    @JsxGetter
+    public boolean isCompact() {
+        return getDomNodeOrDie().hasAttribute("compact");
+    }
+
+    /**
+     * Sets the value of the {@code compact} attribute.
+     * @param compact the value of the {@code compact} attribute
+     */
+    @JsxSetter
+    public void setCompact(final Object compact) {
+        if (JavaScriptEngine.toBoolean(compact)) {
+            getDomNodeOrDie().setAttribute("compact", "");
+        }
+        else {
+            getDomNodeOrDie().removeAttribute("compact");
+        }
+    }
 }

src/main/java/org/htmlunit/javascript/host/html/HTMLDirectoryElement.java

@@ -15,8 +15,11 @@
 package org.htmlunit.javascript.host.html;
 
 import org.htmlunit.html.HtmlDirectory;
+import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
+import org.htmlunit.javascript.configuration.JsxGetter;
+import org.htmlunit.javascript.configuration.JsxSetter;
 
 /**
  * The JavaScript object {@code HTMLDirectoryElement}.
@@ -26,7 +29,7 @@
  * @author Frank Danek
  */
 @JsxClass(domClass = HtmlDirectory.class)
-public class HTMLDirectoryElement extends HTMLListElement {
+public class HTMLDirectoryElement extends HTMLElement {
 
     /**
      * JavaScript constructor.
@@ -36,4 +39,27 @@ public class HTMLDirectoryElement extends HTMLListElement {
     public void jsConstructor() {
         super.jsConstructor();
     }
+
+    /**
+     * Returns the value of the {@code compact} attribute.
+     * @return the value of the {@code compact} attribute
+     */
+    @JsxGetter
+    public boolean isCompact() {
+        return getDomNodeOrDie().hasAttribute("compact");
+    }
+
+    /**
+     * Sets the value of the {@code compact} attribute.
+     * @param compact the value of the {@code compact} attribute
+     */
+    @JsxSetter
+    public void setCompact(final Object compact) {
+        if (JavaScriptEngine.toBoolean(compact)) {
+            getDomNodeOrDie().setAttribute("compact", "");
+        }
+        else {
+            getDomNodeOrDie().removeAttribute("compact");
+        }
+    }
 }

src/main/java/org/htmlunit/javascript/host/html/HTMLLIElement.java

@@ -17,6 +17,8 @@
 import org.htmlunit.html.HtmlListItem;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
+import org.htmlunit.javascript.configuration.JsxGetter;
+import org.htmlunit.javascript.configuration.JsxSetter;
 
 /**
  * The JavaScript object {@code HTMLLIElement}.
@@ -35,4 +37,22 @@ public class HTMLLIElement extends HTMLElement {
     public void jsConstructor() {
         super.jsConstructor();
     }
+
+    /**
+     * Returns the value of the {@code type} property.
+     * @return the value of the {@code type} property
+     */
+    @JsxGetter
+    public String getType() {
+        return getDomNodeOrDie().getAttributeDirect("type");
+    }
+
+    /**
+     * Sets the value of the {@code type} property.
+     * @param type the value of the {@code type} property
+     */
+    @JsxSetter
+    public void setType(final String type) {
+        getDomNodeOrDie().setAttribute("type", type);
+    }
 }

src/main/java/org/htmlunit/javascript/host/html/HTMLListElement.java

@@ -18,8 +18,11 @@
 
 import org.htmlunit.html.DomElement;
 import org.htmlunit.html.HtmlMenu;
+import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
+import org.htmlunit.javascript.configuration.JsxGetter;
+import org.htmlunit.javascript.configuration.JsxSetter;
 
 /**
  * The JavaScript object {@code HTMLMenuElement}.
@@ -29,7 +32,7 @@
  * @author Ronald Brill
  */
 @JsxClass(domClass = HtmlMenu.class)
-public class HTMLMenuElement extends HTMLListElement {
+public class HTMLMenuElement extends HTMLElement {
 
     /**
      * JavaScript constructor.
@@ -44,8 +47,7 @@ public void jsConstructor() {
      * Returns the value of the {@code type} property.
      * @return the value of the {@code type} property
      */
-    @Override
-    public String getType() {
+    protected String getType() {
         final String type = getDomNodeOrDie().getAttributeDirect("type");
         if (getBrowserVersion().hasFeature(JS_MENU_TYPE_PASS)) {
             return type;
@@ -65,8 +67,7 @@ public String getType() {
      * Sets the value of the {@code type} property.
      * @param type the value of the {@code type} property
      */
-    @Override
-    public void setType(final String type) {
+    protected void setType(final String type) {
         if (getBrowserVersion().hasFeature(JS_MENU_TYPE_PASS)) {
             getDomNodeOrDie().setAttribute(DomElement.TYPE_ATTRIBUTE, type);
             return;
@@ -83,4 +84,27 @@ public void setType(final String type) {
 
         getDomNodeOrDie().setAttribute(DomElement.TYPE_ATTRIBUTE, "list");
     }
+
+    /**
+     * Returns the value of the {@code compact} attribute.
+     * @return the value of the {@code compact} attribute
+     */
+    @JsxGetter
+    public boolean isCompact() {
+        return getDomNodeOrDie().hasAttribute("compact");
+    }
+
+    /**
+     * Sets the value of the {@code compact} attribute.
+     * @param compact the value of the {@code compact} attribute
+     */
+    @JsxSetter
+    public void setCompact(final Object compact) {
+        if (JavaScriptEngine.toBoolean(compact)) {
+            getDomNodeOrDie().setAttribute("compact", "");
+        }
+        else {
+            getDomNodeOrDie().removeAttribute("compact");
+        }
+    }
 }

src/main/java/org/htmlunit/javascript/host/html/HTMLMenuElement.java

@@ -15,6 +15,7 @@
 package org.htmlunit.javascript.host.html;
 
 import org.htmlunit.html.HtmlOrderedList;
+import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
 import org.htmlunit.javascript.configuration.JsxGetter;
@@ -27,7 +28,7 @@
  * @author Ronald Brill
  */
 @JsxClass(domClass = HtmlOrderedList.class)
-public class HTMLOListElement extends HTMLListElement {
+public class HTMLOListElement extends HTMLElement {
 
     /**
      * JavaScript constructor.
@@ -39,24 +40,43 @@ public void jsConstructor() {
     }
 
     /**
-     * Returns the value of the {@code type} attribute.
-     *
-     * @return the value of the {@code type} attribute
+     * Returns the value of the {@code type} property.
+     * @return the value of the {@code type} property
      */
-    @Override
     @JsxGetter
     public String getType() {
-        return super.getType();
+        return getDomNodeOrDie().getAttributeDirect("type");
     }
 
     /**
-     * Sets the value of the {@code type} attribute.
-     *
-     * @param type the value of the {@code type} attribute
+     * Sets the value of the {@code type} property.
+     * @param type the value of the {@code type} property
      */
-    @Override
     @JsxSetter
     public void setType(final String type) {
-        super.setType(type);
+        getDomNodeOrDie().setAttribute("type", type);
+    }
+
+    /**
+     * Returns the value of the {@code compact} attribute.
+     * @return the value of the {@code compact} attribute
+     */
+    @JsxGetter
+    public boolean isCompact() {
+        return getDomNodeOrDie().hasAttribute("compact");
+    }
+
+    /**
+     * Sets the value of the {@code compact} attribute.
+     * @param compact the value of the {@code compact} attribute
+     */
+    @JsxSetter
+    public void setCompact(final Object compact) {
+        if (JavaScriptEngine.toBoolean(compact)) {
+            getDomNodeOrDie().setAttribute("compact", "");
+        }
+        else {
+            getDomNodeOrDie().removeAttribute("compact");
+        }
     }
 }