Remove Mammoth prefix from util classes

5 files changed, 16 insertions, 16 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java b/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java
index 9f1d63d..3aaf655 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/DefaultStyles.java
@@ -2,7 +2,7 @@ package org.zwobble.mammoth.internal.styles;
 
 import org.zwobble.mammoth.internal.styles.parsing.StyleMapParser;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class DefaultStyles {
     public static final StyleMap DEFAULT_STYLE_MAP = StyleMapParser.parseStyleMappings(list(
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
index 59c0908..93025d9 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
@@ -5,9 +5,9 @@ import org.zwobble.mammoth.internal.html.HtmlNode;
 import java.util.List;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-import static org.zwobble.mammoth.internal.util.MammothLists.reversed;
-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.reversed;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlPath {
     public static final HtmlPath EMPTY = new HtmlPath(list());
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 7f110a4..08221eb 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
@@ -6,8 +6,8 @@ import org.zwobble.mammoth.internal.html.HtmlNode;
 import java.util.List;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.MammothLists.list;
-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.Maps.map;
 
 public class HtmlPathElement {
     public static HtmlPathElement fresh(String tagName) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
index 5f2903b..81dfe80 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
@@ -2,13 +2,13 @@ package org.zwobble.mammoth.internal.styles;
 
 import org.zwobble.mammoth.internal.documents.Paragraph;
 import org.zwobble.mammoth.internal.documents.Run;
-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.List;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.internal.util.MammothIterables.tryFind;
+import static org.zwobble.mammoth.internal.util.Iterables.tryFind;
 
 public class StyleMap {
     public static StyleMapBuilder builder() {
@@ -43,12 +43,12 @@ public class StyleMap {
     public StyleMap update(StyleMap styleMap) {
         // TODO: add appropriate tests
         return new StyleMap(
-            MammothOptionals.first(styleMap.bold, bold),
-            MammothOptionals.first(styleMap.italic, italic),
-            MammothOptionals.first(styleMap.underline, underline),
-            MammothOptionals.first(styleMap.strikethrough, strikethrough),
-            MammothLists.eagerConcat(styleMap.paragraphStyles, paragraphStyles),
-            MammothLists.eagerConcat(styleMap.runStyles, runStyles));
+            Optionals.first(styleMap.bold, bold),
+            Optionals.first(styleMap.italic, italic),
+            Optionals.first(styleMap.underline, underline),
+            Optionals.first(styleMap.strikethrough, strikethrough),
+            Lists.eagerConcat(styleMap.paragraphStyles, paragraphStyles),
+            Lists.eagerConcat(styleMap.runStyles, runStyles));
     }
 
     public Optional<HtmlPath> getBold() {
diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
index a21df44..c006319 100644
--- a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
@@ -12,7 +12,7 @@ import java.math.BigInteger;
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class StyleMappingParser extends BaseParser<StyleMapBuilder> {
     Rule StyleMapping(Var<StyleMapBuilder> styleMap) {