diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-03-26 17:57:45 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-03-26 17:57:45 +0000 |
| commit | 581aec7d05f06456a384aa9adef7d781a666bf91 (patch) | |
| tree | 58bdd3c3de41a3b8c4886b23fc368be47d4486e2 /src/main/java/org/zwobble/mammoth/internal/html | |
| parent | 3f978b230ce8f5713be07b5dec2f0ccebacbda71 (diff) | |
Remove Mammoth prefix from util classes
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/html')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/html/Html.java | 14 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java | 2 |
2 files changed, 8 insertions, 8 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 8f4d671..f0a01dd 100644 --- a/src/main/java/org/zwobble/mammoth/internal/html/Html.java +++ b/src/main/java/org/zwobble/mammoth/internal/html/Html.java @@ -1,16 +1,16 @@ package org.zwobble.mammoth.internal.html; -import org.zwobble.mammoth.internal.util.MammothLists; -import org.zwobble.mammoth.internal.util.MammothOptionals; +import org.zwobble.mammoth.internal.util.Lists; +import org.zwobble.mammoth.internal.util.Optionals; import java.util.ArrayList; import java.util.List; import java.util.Map; import static org.zwobble.mammoth.internal.util.Casts.tryCast; -import static org.zwobble.mammoth.internal.util.MammothLists.list; -import static org.zwobble.mammoth.internal.util.MammothLists.tryGetLast; -import static org.zwobble.mammoth.internal.util.MammothMaps.map; +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; public class Html { public static final HtmlNode FORCE_WRITE = HtmlForceWrite.FORCE_WRITE; @@ -70,7 +70,7 @@ public class Html { } public static List<HtmlNode> stripEmpty(List<HtmlNode> nodes) { - return MammothLists.eagerFlatMap(nodes, node -> stripEmpty(node)); + return Lists.eagerFlatMap(nodes, node -> stripEmpty(node)); } private static List<HtmlNode> stripEmpty(HtmlNode node) { @@ -156,7 +156,7 @@ public class Html { } private static boolean tryCollapse(List<HtmlNode> collapsed, HtmlNode node) { - return MammothOptionals.map( + return Optionals.map( tryGetLast(collapsed).flatMap(last -> tryCast(HtmlElement.class, last)), tryCast(HtmlElement.class, node), (last, next) -> { 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 6a87567..8747af1 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,7 @@ package org.zwobble.mammoth.internal.html; import java.util.Map; -import static org.zwobble.mammoth.internal.util.MammothLists.orderedBy; +import static org.zwobble.mammoth.internal.util.Lists.orderedBy; public class HtmlWriter { public static void write(HtmlNode node, StringBuilder builder) { |
