From 86207d30715fe000b95b2f8e8b55b59a21aba34b Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 24 Feb 2016 21:03:42 +0000 Subject: Turn Result into a minimal interface --- .../org/zwobble/mammoth/internal/docx/DocumentReader.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java') 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 4341bbf..86a0d1a 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java @@ -2,7 +2,7 @@ package org.zwobble.mammoth.internal.docx; import org.zwobble.mammoth.internal.documents.Document; import org.zwobble.mammoth.internal.documents.Notes; -import org.zwobble.mammoth.results.Result; +import org.zwobble.mammoth.internal.results.InternalResult; import org.zwobble.mammoth.internal.util.MammothLists; import org.zwobble.mammoth.internal.xml.XmlElement; @@ -21,7 +21,7 @@ public class DocumentReader { BodyXmlReader forName(String name); } - public static Result readDocument(Optional path, DocxFile zipFile) { + public static InternalResult readDocument(Optional path, DocxFile zipFile) { Styles styles = readStyles(zipFile); Numbering numbering = readNumbering(zipFile); ContentTypes contentTypes = readContentTypes(zipFile); @@ -63,14 +63,14 @@ public class DocumentReader { } } - private static Result readNotes(DocxFile file, BodyReaders bodyReaders) { - return Result.map( + private static InternalResult readNotes(DocxFile file, BodyReaders bodyReaders) { + return InternalResult.map( tryParseOfficeXml(file, "word/footnotes.xml") .map(NotesXmlReader.footnote(bodyReaders.forName("footnotes"))::readElement) - .orElse(Result.success(list())), + .orElse(InternalResult.success(list())), tryParseOfficeXml(file, "word/endnotes.xml") .map(NotesXmlReader.endnote(bodyReaders.forName("endnotes"))::readElement) - .orElse(Result.success(list())), + .orElse(InternalResult.success(list())), MammothLists::concat).map(Notes::new); } -- cgit v1.2.3