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/styles/StyleMap.java | |
| parent | 3f978b230ce8f5713be07b5dec2f0ccebacbda71 (diff) | |
Remove Mammoth prefix from util classes
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java | 18 |
1 files changed, 9 insertions, 9 deletions
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() { |
