From cffffaa33a22fcb8abb0d98cd6fce1e1be6cdb73 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 17 Jun 2016 21:58:24 +0100 Subject: Fix ambiguous method references --- src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 81e0307..ac7521f 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java @@ -4,6 +4,7 @@ import org.zwobble.mammoth.internal.documents.*; import org.zwobble.mammoth.internal.results.InternalResult; import org.zwobble.mammoth.internal.util.Casts; import org.zwobble.mammoth.internal.util.InputStreamSupplier; +import org.zwobble.mammoth.internal.util.Lists; import org.zwobble.mammoth.internal.util.Optionals; import org.zwobble.mammoth.internal.xml.XmlElement; import org.zwobble.mammoth.internal.xml.XmlElementLike; @@ -16,7 +17,6 @@ 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.Iterables.lazyFilter; -import static org.zwobble.mammoth.internal.util.Lists.eagerMap; import static org.zwobble.mammoth.internal.util.Lists.list; import static org.zwobble.mammoth.internal.util.Maps.entry; import static org.zwobble.mammoth.internal.util.Maps.lookup; @@ -268,7 +268,7 @@ public class BodyXmlReader { } } - return success(eagerMap(rows, (rowIndex, rowElement) -> { + return success(Lists.eagerMapWithIndex(rows, (rowIndex, rowElement) -> { TableRow row = (TableRow) rowElement; List mergedCells = new ArrayList<>(); -- cgit v1.2.3