From 581aec7d05f06456a384aa9adef7d781a666bf91 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 26 Mar 2016 17:57:45 +0000 Subject: Remove Mammoth prefix from util classes --- .../org/zwobble/mammoth/internal/docx/BodyXmlReader.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java') diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java index d528622..be2cbb9 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java @@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.docx; import org.zwobble.mammoth.internal.documents.*; import org.zwobble.mammoth.internal.results.InternalResult; import org.zwobble.mammoth.internal.util.InputStreamSupplier; -import org.zwobble.mammoth.internal.util.MammothOptionals; +import org.zwobble.mammoth.internal.util.Optionals; import org.zwobble.mammoth.internal.xml.XmlElement; import org.zwobble.mammoth.internal.xml.XmlElementLike; import org.zwobble.mammoth.internal.xml.XmlElementList; @@ -15,10 +15,10 @@ import java.util.function.Function; import static org.zwobble.mammoth.internal.docx.ReadResult.EMPTY_SUCCESS; import static org.zwobble.mammoth.internal.docx.ReadResult.success; -import static org.zwobble.mammoth.internal.util.MammothIterables.lazyFilter; -import static org.zwobble.mammoth.internal.util.MammothLists.list; -import static org.zwobble.mammoth.internal.util.MammothSets.set; -import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft; +import static org.zwobble.mammoth.internal.util.Iterables.lazyFilter; +import static org.zwobble.mammoth.internal.util.Lists.list; +import static org.zwobble.mammoth.internal.util.Sets.set; +import static org.zwobble.mammoth.internal.util.Strings.trimLeft; public class BodyXmlReader { private static final Set IMAGE_TYPES_SUPPORTED_BY_BROWSERS = set( @@ -216,7 +216,7 @@ public class BodyXmlReader { private Optional readNumbering(XmlElementLike properties) { XmlElementLike numberingProperties = properties.findChildOrEmpty("w:numPr"); - return MammothOptionals.flatMap( + return Optionals.flatMap( readVal(numberingProperties, "w:numId"), readVal(numberingProperties, "w:ilvl"), numbering::findLevel); -- cgit v1.2.3