Move isVoidElement to instance method of HtmlElement

3 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/html/Html.java b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
index 8eef6d3..6a0432c 100644
--- a/src/main/java/org/zwobble/mammoth/internal/html/Html.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
@@ -6,13 +6,11 @@ import org.zwobble.mammoth.internal.util.Optionals;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import static org.zwobble.mammoth.internal.util.Casts.tryCast;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Lists.tryGetLast;
 import static org.zwobble.mammoth.internal.util.Maps.map;
-import static org.zwobble.mammoth.internal.util.Sets.set;
 
 public class Html {
     public static final HtmlNode FORCE_WRITE = HtmlForceWrite.FORCE_WRITE;
@@ -72,7 +70,7 @@ public class Html {
             @Override
             public List<HtmlNode> visit(HtmlElement element) {
                 List<HtmlNode> children = stripEmpty(element.getChildren());
-                if (children.isEmpty() && !isVoidElement(element)) {
+                if (children.isEmpty() && !element.isVoid()) {
                     return list();
                 } else {
                     return list(new HtmlElement(element.getTag(), children));
@@ -159,14 +157,4 @@ public class Html {
         return second.getTagNames().contains(first.getTagName()) &&
             first.getAttributes().equals(second.getAttributes());
     }
-
-    static boolean isVoidElement(HtmlElement element) {
-        return element.getChildren().isEmpty() && isVoidTag(element.getTagName());
-    }
-
-    private static final Set<String> VOID_TAG_NAMES = set("img", "br", "hr");
-
-    private static boolean isVoidTag(String tagName) {
-        return VOID_TAG_NAMES.contains(tagName);
-    }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/html/HtmlElement.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlElement.java
index 4e41b05..999945e 100644
--- a/src/main/java/org/zwobble/mammoth/internal/html/HtmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlElement.java
@@ -2,6 +2,9 @@ package org.zwobble.mammoth.internal.html;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import static org.zwobble.mammoth.internal.util.Sets.set;
 
 public class HtmlElement implements HtmlNode {
     private final HtmlTag tag;
@@ -40,6 +43,16 @@ public class HtmlElement implements HtmlNode {
         return tag.getSeparator();
     }
 
+    public boolean isVoid() {
+        return children.isEmpty() && isVoidTag(getTagName());
+    }
+
+    private static final Set<String> VOID_TAG_NAMES = set("img", "br", "hr");
+
+    private static boolean isVoidTag(String tagName) {
+        return VOID_TAG_NAMES.contains(tagName);
+    }
+
     @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
diff --git a/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
index 910fd81..ec4f322 100644
--- a/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
@@ -2,7 +2,6 @@ package org.zwobble.mammoth.internal.html;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.html.Html.isVoidElement;
 import static org.zwobble.mammoth.internal.util.Lists.orderedBy;
 
 public class HtmlWriter {
@@ -14,7 +13,7 @@ public class HtmlWriter {
 
                 HtmlWriter.generateAttributes(element.getAttributes(), builder);
 
-                if (isVoidElement(element)) {
+                if (element.isVoid()) {
                     builder.append(" />");
                 } else {
                     builder.append(">");