From 0f9ef005f063198ea2e16ca36beaead4bd5e3824 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Thu, 14 Apr 2016 21:12:07 +0100
Subject: Add .NET output

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

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

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 be2cbb9..113578d 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -268,7 +268,7 @@ public class BodyXmlReader {
         Optional<String> title = element.getAttributeOrNone("o:title");
         String relationshipId = element.getAttribute("r:id");
         String imagePath = relationshipIdToDocxPath(relationshipId);
-        return readImage(imagePath, title, () -> DocxFile.getInputStream(file, imagePath));
+        return readImage(imagePath, title, () -> DocxFiles.getInputStream(file, imagePath));
     }
 
     private ReadResult readInline(XmlElement element) {
@@ -290,7 +290,7 @@ public class BodyXmlReader {
         Optional<String> linkRelationshipId = blip.getAttributeOrNone("r:link");
         if (embedRelationshipId.isPresent()) {
             String imagePath = relationshipIdToDocxPath(embedRelationshipId.get());
-            return readImage(imagePath, altText, () -> DocxFile.getInputStream(file, imagePath));
+            return readImage(imagePath, altText, () -> DocxFiles.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/DocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFile.java
index 8e73a04..23bddb1 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFile.java
@@ -6,10 +6,5 @@ import java.io.InputStream;
 import java.util.Optional;
 
 public interface DocxFile extends Closeable {
-    static InputStream getInputStream(DocxFile file, String name) throws IOException {
-        return file.tryGetInputStream(name)
-            .orElseThrow(() -> new IOException("Missing entry in file: " + name));
-    }
-
     Optional<InputStream> tryGetInputStream(String name) throws IOException;
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java
new file mode 100644
index 0000000..5d06b76
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java
@@ -0,0 +1,11 @@
+package org.zwobble.mammoth.internal.docx;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class DocxFiles {
+    static InputStream getInputStream(DocxFile file, String name) throws IOException {
+        return file.tryGetInputStream(name)
+            .orElseThrow(() -> new IOException("Missing entry in file: " + name));
+    }
+}
-- 
cgit v1.2.3