From 933f21dd728976f1e64cf13b5de0558efaac2911 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 10 Dec 2016 21:57:19 +0000
Subject: Move isVoidElement to instance method of HtmlElement

---
 src/main/java/org/zwobble/mammoth/internal/html/Html.java | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/main/java/org/zwobble/mammoth/internal/html/Html.java')

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);
-    }
 }
-- 
cgit v1.2.3