diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-11-13 19:40:02 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-11-13 19:40:02 +0000 |
| commit | 90be34b20ed99409523a2d5ff174f48058969684 (patch) | |
| tree | 66f74b4acabdfd139896c1a8ba6283216952e292 /src/main/java/org/zwobble | |
| parent | 5d244e294bf0fc420cca8ed8bf481b7353d459d5 (diff) | |
Rename DocxFiles to Archives
Diffstat (limited to 'src/main/java/org/zwobble')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/docx/Archives.java (renamed from src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java b/src/main/java/org/zwobble/mammoth/internal/docx/Archives.java index 1860bb7..ae4f7e3 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/Archives.java @@ -3,7 +3,7 @@ package org.zwobble.mammoth.internal.docx; import java.io.IOException; import java.io.InputStream; -public class DocxFiles { +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)); |
