Introduce HtmlTag class

1 files changed, 5 insertions, 18 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
index 1be14af..dc9a60e 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
@@ -2,6 +2,7 @@ package org.zwobble.mammoth.internal.styles;
 
 import org.zwobble.mammoth.internal.html.HtmlElement;
 import org.zwobble.mammoth.internal.html.HtmlNode;
+import org.zwobble.mammoth.internal.html.HtmlTag;
 
 import java.util.List;
 import java.util.Map;
@@ -11,24 +12,10 @@ import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlPathElement {
-    public static HtmlPathElement collapsible(String tagName) {
-        return collapsible(tagName, map());
-    }
-
-    public static HtmlPathElement collapsible(String tagName, Map<String, String> attributes) {
-        return new HtmlPathElement(list(tagName), attributes, true, "");
-    }
-
-    private final List<String> tagNames;
-    private final Map<String, String> attributes;
-    private final boolean isCollapsible;
-    private final String separator;
+    private final HtmlTag tag;
 
-    public HtmlPathElement(List<String> tagNames, Map<String, String> attributes, boolean isCollapsible, String separator) {
-        this.tagNames = tagNames;
-        this.attributes = attributes;
-        this.isCollapsible = isCollapsible;
-        this.separator = separator;
+    public HtmlPathElement(HtmlTag tag) {
+        this.tag = tag;
     }
 
     public Supplier<List<HtmlNode>> wrap(Supplier<List<HtmlNode>> generateNodes) {
@@ -36,6 +23,6 @@ public class HtmlPathElement {
     }
 
     private List<HtmlNode> wrapNodes(List<HtmlNode> nodes) {
-        return list(new HtmlElement(tagNames, attributes, nodes, isCollapsible));
+        return list(new HtmlElement(tag, nodes));
     }
 }