From 5d244e294bf0fc420cca8ed8bf481b7353d459d5 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 13 Nov 2016 19:39:25 +0000
Subject: Rename DocxFile to Archive

---
 .../mammoth/internal/InternalDocumentConverter.java  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java')

diff --git a/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java b/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java
index 3966b51..c5ba826 100644
--- a/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java
+++ b/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java
@@ -6,10 +6,10 @@ import org.zwobble.mammoth.internal.documents.DocumentElement;
 import org.zwobble.mammoth.internal.documents.HasChildren;
 import org.zwobble.mammoth.internal.documents.Paragraph;
 import org.zwobble.mammoth.internal.documents.Text;
-import org.zwobble.mammoth.internal.docx.DocxFile;
+import org.zwobble.mammoth.internal.docx.Archive;
 import org.zwobble.mammoth.internal.docx.EmbeddedStyleMap;
-import org.zwobble.mammoth.internal.docx.InMemoryDocxFile;
-import org.zwobble.mammoth.internal.docx.ZippedDocxFile;
+import org.zwobble.mammoth.internal.docx.InMemoryArchive;
+import org.zwobble.mammoth.internal.docx.ZippedArchive;
 import org.zwobble.mammoth.internal.html.Html;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.styles.StyleMap;
@@ -48,7 +48,7 @@ public class InternalDocumentConverter {
                 convertToHtml(Optional.of(file.toPath()), zipFile)));
     }
 
-    private InternalResult<String> convertToHtml(Optional<Path> path, DocxFile zipFile) {
+    private InternalResult<String> convertToHtml(Optional<Path> path, Archive zipFile) {
         Optional<StyleMap> styleMap = readEmbeddedStyleMap(zipFile).map(StyleMapParser::parse);
         DocumentToHtmlOptions conversionOptions = styleMap.map(options::addEmbeddedStyleMap).orElse(options);
 
@@ -59,7 +59,7 @@ public class InternalDocumentConverter {
             .map(Html::write);
     }
 
-    private Optional<String> readEmbeddedStyleMap(DocxFile zipFile) {
+    private Optional<String> readEmbeddedStyleMap(Archive zipFile) {
         return PassThroughException.wrap(() -> EmbeddedStyleMap.readStyleMap(zipFile));
     }
 
@@ -75,19 +75,19 @@ public class InternalDocumentConverter {
                 extractRawText(Optional.of(file.toPath()), zipFile)));
     }
 
-    private InternalResult<String> extractRawText(Optional<Path> path, DocxFile zipFile) {
+    private InternalResult<String> extractRawText(Optional<Path> path, Archive zipFile) {
         return readDocument(path, zipFile)
             .map(InternalDocumentConverter::extractRawTextOfChildren);
     }
 
-    private static <T> T withDocxFile(File file, Function<DocxFile, T> function) throws IOException {
-        try (DocxFile zipFile = new ZippedDocxFile(file)) {
+    private static <T> T withDocxFile(File file, Function<Archive, T> function) throws IOException {
+        try (Archive zipFile = new ZippedArchive(file)) {
             return function.apply(zipFile);
         }
     }
 
-    private static <T> T withDocxFile(InputStream stream, Function<DocxFile, T> function) throws IOException {
-        try (DocxFile zipFile = InMemoryDocxFile.fromStream(stream)) {
+    private static <T> T withDocxFile(InputStream stream, Function<Archive, T> function) throws IOException {
+        try (Archive zipFile = InMemoryArchive.fromStream(stream)) {
             return function.apply(zipFile);
         }
     }
-- 
cgit v1.2.3