diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-02-21 21:11:54 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-02-21 21:11:54 +0000 |
| commit | 9c6e168c789437caabfb0e78474e34d5124019d7 (patch) | |
| tree | bb7b5b90cddb71c3077cfca71b1bc7799d4ad529 /src/main/java | |
| parent | 466d4ed5374e3ada2d335bc04463a426be1327b8 (diff) | |
Allow HTML path elements to have a choice of tag names
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/styles/HtmlPath.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/styles/HtmlPathElement.java | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/org/zwobble/mammoth/styles/HtmlPath.java b/src/main/java/org/zwobble/mammoth/styles/HtmlPath.java index ffad58c..eb15dc5 100644 --- a/src/main/java/org/zwobble/mammoth/styles/HtmlPath.java +++ b/src/main/java/org/zwobble/mammoth/styles/HtmlPath.java @@ -17,11 +17,11 @@ public class HtmlPath { } public static HtmlPath element(String tagName, Map<String, String> attributes) { - return new HtmlPath(list(new HtmlPathElement(tagName, attributes, false))); + return new HtmlPath(list(new HtmlPathElement(list(tagName), attributes, false))); } public static HtmlPath collapsibleElement(String tagName) { - return new HtmlPath(list(new HtmlPathElement(tagName, map(), true))); + return new HtmlPath(list(new HtmlPathElement(list(tagName), map(), true))); } private final List<HtmlPathElement> elements; diff --git a/src/main/java/org/zwobble/mammoth/styles/HtmlPathElement.java b/src/main/java/org/zwobble/mammoth/styles/HtmlPathElement.java index cfd20a6..541c6e7 100644 --- a/src/main/java/org/zwobble/mammoth/styles/HtmlPathElement.java +++ b/src/main/java/org/zwobble/mammoth/styles/HtmlPathElement.java @@ -11,24 +11,24 @@ import static org.zwobble.mammoth.util.MammothMaps.map; public class HtmlPathElement { public static HtmlPathElement fresh(String tagName) { - return new HtmlPathElement(tagName, map(), false); + return new HtmlPathElement(list(tagName), map(), false); } public static HtmlPathElement collapsible(String tagName) { - return new HtmlPathElement(tagName, map(), true); + return new HtmlPathElement(list(tagName), map(), true); } - private final String tagName; + private final List<String> tagNames; private final Map<String, String> attributes; private final boolean isCollapsible; - public HtmlPathElement(String tagName, Map<String, String> attributes, boolean isCollapsible) { - this.tagName = tagName; + public HtmlPathElement(List<String> tagNames, Map<String, String> attributes, boolean isCollapsible) { + this.tagNames = tagNames; this.attributes = attributes; this.isCollapsible = isCollapsible; } public List<HtmlNode> wrap(List<HtmlNode> nodes) { - return list(new HtmlElement(list(tagName), attributes, nodes, isCollapsible)); + return list(new HtmlElement(tagNames, attributes, nodes, isCollapsible)); } } |
