From f63e7014a68c90160da89a25db613381edbc6e5e Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 13 Feb 2016 19:48:59 +0000 Subject: Read hyperlinks with href --- src/main/java/org/zwobble/mammoth/Mammoth.java | 11 +++++++- .../mammoth/documents/DocumentElementVisitor.java | 2 ++ .../org/zwobble/mammoth/documents/Hyperlink.java | 32 ++++++++++++++++++++++ .../org/zwobble/mammoth/docx/BodyXmlReader.java | 14 +++++++++- .../org/zwobble/mammoth/docx/Relationships.java | 4 +++ 5 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/zwobble/mammoth/documents/Hyperlink.java (limited to 'src/main/java/org') diff --git a/src/main/java/org/zwobble/mammoth/Mammoth.java b/src/main/java/org/zwobble/mammoth/Mammoth.java index 4e69a6b..caf668f 100644 --- a/src/main/java/org/zwobble/mammoth/Mammoth.java +++ b/src/main/java/org/zwobble/mammoth/Mammoth.java @@ -21,7 +21,11 @@ public class Mammoth { Styles styles = Styles.EMPTY; Numbering numbering = Numbering.EMPTY; - DocumentXmlReader reader = new DocumentXmlReader(new BodyXmlReader(styles, numbering)); + Relationships relationships = Relationships.EMPTY; + DocumentXmlReader reader = new DocumentXmlReader(new BodyXmlReader( + styles, + numbering, + relationships)); return reader.readElement(documentXml) .map(Mammoth::convertToHtml); } catch (IOException e) { @@ -80,6 +84,11 @@ public class Mammoth { public String visit(TableCell tableCell) { throw new UnsupportedOperationException(); } + + @Override + public String visit(Hyperlink hyperlink) { + throw new UnsupportedOperationException(); + } }); } } diff --git a/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java b/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java index 0781960..564bacb 100644 --- a/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java +++ b/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java @@ -10,4 +10,6 @@ public interface DocumentElementVisitor { T visit(Table table); T visit(TableRow tableRow); T visit(TableCell tableCell); + + T visit(Hyperlink hyperlink); } diff --git a/src/main/java/org/zwobble/mammoth/documents/Hyperlink.java b/src/main/java/org/zwobble/mammoth/documents/Hyperlink.java new file mode 100644 index 0000000..1d62076 --- /dev/null +++ b/src/main/java/org/zwobble/mammoth/documents/Hyperlink.java @@ -0,0 +1,32 @@ +package org.zwobble.mammoth.documents; + +import java.util.List; +import java.util.Optional; + +public class Hyperlink implements DocumentElement, HasChildren { + public static Hyperlink href(String href, List children) { + return new Hyperlink(Optional.of(href), children); + } + + private final Optional href; + private final List children; + + public Hyperlink(Optional href, List children) { + this.href = href; + this.children = children; + } + + public Optional getHref() { + return href; + } + + @Override + public List getChildren() { + return children; + } + + @Override + public T accept(DocumentElementVisitor visitor) { + return visitor.visit(this); + } +} diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java index dcef0c5..6b6fceb 100644 --- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java @@ -20,10 +20,12 @@ import static org.zwobble.mammoth.util.MammothLists.list; public class BodyXmlReader { private final Styles styles; private final Numbering numbering; + private final Relationships relationships; - public BodyXmlReader(Styles styles, Numbering numbering) { + public BodyXmlReader(Styles styles, Numbering numbering, Relationships relationships) { this.styles = styles; this.numbering = numbering; + this.relationships = relationships; } public ReadResult readElement(XmlElement element) { @@ -54,6 +56,9 @@ public class BodyXmlReader { case "w:txbxContent": return readElements(element.children()); + case "w:hyperlink": + return readHyperlink(element); + case "w:pPr": return EMPTY_SUCCESS; @@ -152,6 +157,13 @@ public class BodyXmlReader { numbering::findLevel); } + private ReadResult readHyperlink(XmlElement element) { + String relationshipId = element.getAttribute("r:id"); + return readElements(element.children()) + .map(children -> Hyperlink.href( + relationships.findRelationshipById(relationshipId).getTarget(), children)); + } + private Optional readVal(XmlElementLike element, String name) { return element.findChildOrEmpty(name).getAttributeOrNone("w:val"); } diff --git a/src/main/java/org/zwobble/mammoth/docx/Relationships.java b/src/main/java/org/zwobble/mammoth/docx/Relationships.java index d33a091..f23ed85 100644 --- a/src/main/java/org/zwobble/mammoth/docx/Relationships.java +++ b/src/main/java/org/zwobble/mammoth/docx/Relationships.java @@ -3,7 +3,11 @@ package org.zwobble.mammoth.docx; import java.util.Map; import java.util.Optional; +import static org.zwobble.mammoth.util.MammothMaps.map; + public class Relationships { + public static final Relationships EMPTY = new Relationships(map()); + private final Map relationships; public Relationships(Map relationships) { -- cgit v1.2.3