diff options
Diffstat (limited to 'src/main')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java index 86a0d1a..93caee4 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java @@ -71,7 +71,7 @@ public class DocumentReader { tryParseOfficeXml(file, "word/endnotes.xml") .map(NotesXmlReader.endnote(bodyReaders.forName("endnotes"))::readElement) .orElse(InternalResult.success(list())), - MammothLists::concat).map(Notes::new); + MammothLists::eagerConcat).map(Notes::new); } private static Styles readStyles(DocxFile file) { 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 4cd72cf..5f2903b 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java @@ -47,8 +47,8 @@ public class StyleMap { MammothOptionals.first(styleMap.italic, italic), MammothOptionals.first(styleMap.underline, underline), MammothOptionals.first(styleMap.strikethrough, strikethrough), - MammothLists.concat(styleMap.paragraphStyles, paragraphStyles), - MammothLists.concat(styleMap.runStyles, runStyles)); + MammothLists.eagerConcat(styleMap.paragraphStyles, paragraphStyles), + MammothLists.eagerConcat(styleMap.runStyles, runStyles)); } public Optional<HtmlPath> getBold() { diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java index d5efabf..46c4b30 100644 --- a/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java +++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java @@ -30,10 +30,10 @@ public class MammothLists { } public static <T> List<T> cons(T head, Iterable<T> tail) { - return concat(list(head), tail); + return eagerConcat(list(head), tail); } - public static <T> List<T> concat(Iterable<T> first, Iterable<T> second) { + public static <T> List<T> eagerConcat(Iterable<T> first, Iterable<T> second) { return ImmutableList.copyOf(Iterables.concat(first, second)); } |