From 90be34b20ed99409523a2d5ff174f48058969684 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 13 Nov 2016 19:40:02 +0000
Subject: Rename DocxFiles to Archives

---
 src/main/java/org/zwobble/mammoth/internal/docx/Archives.java | 11 +++++++++++
 .../java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java |  4 ++--
 .../java/org/zwobble/mammoth/internal/docx/DocxFiles.java     | 11 -----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/org/zwobble/mammoth/internal/docx/Archives.java
 delete mode 100644 src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java

(limited to 'src/main/java')

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Archives.java b/src/main/java/org/zwobble/mammoth/internal/docx/Archives.java
new file mode 100644
index 0000000..ae4f7e3
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Archives.java
@@ -0,0 +1,11 @@
+package org.zwobble.mammoth.internal.docx;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class Archives {
+    static InputStream getInputStream(Archive file, String name) throws IOException {
+        return file.tryGetInputStream(name)
+            .orElseThrow(() -> new IOException("Missing entry in file: " + name));
+    }
+}
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 f31f6ee..ec2d3c1 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -393,7 +393,7 @@ public class BodyXmlReader {
             .map(relationshipId -> {
                 Optional<String> title = element.getAttributeOrNone("o:title");
                 String imagePath = relationshipIdToDocxPath(relationshipId);
-                return readImage(imagePath, title, () -> DocxFiles.getInputStream(file, imagePath));
+                return readImage(imagePath, title, () -> Archives.getInputStream(file, imagePath));
             })
             .orElse(ReadResult.emptyWithWarning("A v:imagedata element without a relationship ID was ignored"));
     }
@@ -421,7 +421,7 @@ public class BodyXmlReader {
         Optional<String> linkRelationshipId = blip.getAttributeOrNone("r:link");
         if (embedRelationshipId.isPresent()) {
             String imagePath = relationshipIdToDocxPath(embedRelationshipId.get());
-            return readImage(imagePath, altText, () -> DocxFiles.getInputStream(file, imagePath));
+            return readImage(imagePath, altText, () -> Archives.getInputStream(file, imagePath));
         } else if (linkRelationshipId.isPresent()) {
             String imagePath = relationships.findRelationshipById(linkRelationshipId.get()).getTarget();
             return readImage(imagePath, altText, () -> fileReader.getInputStream(imagePath));
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java
deleted file mode 100644
index 1860bb7..0000000
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.zwobble.mammoth.internal.docx;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class DocxFiles {
-    static InputStream getInputStream(Archive file, String name) throws IOException {
-        return file.tryGetInputStream(name)
-            .orElseThrow(() -> new IOException("Missing entry in file: " + name));
-    }
-}
-- 
cgit v1.2.3