From c3c2151b4b0fc9b3226a5ec66e0f7952290f3d97 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 23 Jan 2018 20:51:30 +0000 Subject: Pass list of Relationship instances into Relationships --- .../org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java') diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java index 412ca23..eb13a44 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java @@ -481,7 +481,7 @@ class StatefulBodyXmlReader { ReadResult childrenResult = readElements(element.getChildren()); if (relationshipId.isPresent()) { - String targetHref = relationships.findRelationshipById(relationshipId.get()).getTarget(); + String targetHref = relationships.findTargetByRelationshipId(relationshipId.get()); String href = anchor.map(fragment -> Uris.replaceFragment(targetHref, anchor.get())) .orElse(targetHref); return childrenResult.map(children -> @@ -554,7 +554,7 @@ class StatefulBodyXmlReader { String imagePath = relationshipIdToDocxPath(embedRelationshipId.get()); return readImage(imagePath, altText, () -> Archives.getInputStream(file, imagePath)); } else if (linkRelationshipId.isPresent()) { - String imagePath = relationships.findRelationshipById(linkRelationshipId.get()).getTarget(); + String imagePath = relationships.findTargetByRelationshipId(linkRelationshipId.get()); return readImage(imagePath, altText, () -> fileReader.getInputStream(imagePath)); } else { // TODO: emit warning @@ -579,8 +579,8 @@ class StatefulBodyXmlReader { } private String relationshipIdToDocxPath(String relationshipId) { - Relationship relationship = relationships.findRelationshipById(relationshipId); - return uriToZipEntryName("word", relationship.getTarget()); + String target = relationships.findTargetByRelationshipId(relationshipId); + return uriToZipEntryName("word", target); } private Optional readVal(XmlElementLike element, String name) { -- cgit v1.2.3