more cleanup of froms

rbri · rbri · commit 3ce40a9f8ae7 · 2023-10-03T09:27:36.000+02:00
diff --git a/src/main/java/org/htmlunit/html/HtmlElement.java b/src/main/java/org/htmlunit/html/HtmlElement.java
@@ -1022,7 +1022,13 @@ protected void checkChildHierarchy(final Node childNode) throws DOMException {
         super.checkChildHierarchy(childNode);
     }
 
-    void setOwningForm(final HtmlForm form) {
+    /**
+     * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
+     *
+     * Allows the parser to connect to a form that is not a parent of this due to malformed HTML code
+     * @param form the owning form
+     */
+    public void setOwningForm(final HtmlForm form) {
         owningForm_ = form;
     }
 
diff --git a/src/main/java/org/htmlunit/html/HtmlForm.java b/src/main/java/org/htmlunit/html/HtmlForm.java
@@ -94,8 +94,6 @@ public class HtmlForm extends HtmlElement {
 
     private static final Pattern SUBMIT_CHARSET_PATTERN = Pattern.compile("[ ,].*");
 
-    private final List<HtmlElement> lostChildren_ = new ArrayList<>();
-
     private boolean isPreventDefault_;
 
     /**
@@ -932,27 +930,6 @@ public List<HtmlInput> getInputsByValue(final String value) {
         return results;
     }
 
-    /**
-     * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
-     *
-     * Allows the parser to notify the form of a field that doesn't belong to its DOM children
-     * due to malformed HTML code
-     * @param field the form field
-     */
-    public void addLostChild(final HtmlElement field) {
-        lostChildren_.add(field);
-        field.setOwningForm(this);
-    }
-
-    /**
-     * Gets the form elements that may be submitted but that don't belong to the form's children
-     * in the DOM due to incorrect HTML code.
-     * @return the elements
-     */
-    public List<HtmlElement> getLostChildren() {
-        return lostChildren_;
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/main/java/org/htmlunit/html/parser/neko/HtmlUnitNekoDOMBuilder.java b/src/main/java/org/htmlunit/html/parser/neko/HtmlUnitNekoDOMBuilder.java
@@ -398,7 +398,7 @@ else if (consumingForm_ != null) {
             if (newElement instanceof SubmittableElement) {
                 // Let these be owned by the form
                 if (((HtmlElement) newElement).getEnclosingForm() != consumingForm_) {
-                    consumingForm_.addLostChild((HtmlElement) newElement);
+                    ((HtmlElement) newElement).setOwningForm(consumingForm_);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1022,7 +1022,13 @@ protected void checkChildHierarchy(final Node childNode) throws DOMException {`
`1022`	`1022`	`super.checkChildHierarchy(childNode);`
`1023`	`1023`	`}`
`1024`	`1024`
`1025`		`- void setOwningForm(final HtmlForm form) {`
	`1025`	`+ /**`
	`1026`	`+ * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>`
	`1027`	`+ *`
	`1028`	`+ * Allows the parser to connect to a form that is not a parent of this due to malformed HTML code`
	`1029`	`+ * @param form the owning form`
	`1030`	`+ */`
	`1031`	`+ public void setOwningForm(final HtmlForm form) {`
`1026`	`1032`	`owningForm_ = form;`
`1027`	`1033`	`}`
`1028`	`1034`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ else if (consumingForm_ != null) {`
`398`	`398`	`if (newElement instanceof SubmittableElement) {`
`399`	`399`	`// Let these be owned by the form`
`400`	`400`	`if (((HtmlElement) newElement).getEnclosingForm() != consumingForm_) {`
`401`		`- consumingForm_.addLostChild((HtmlElement) newElement);`
	`401`	`+ ((HtmlElement) newElement).setOwningForm(consumingForm_);`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`	`}`