From 6f9603e3f17ad7142edebf83212dfa97d1576ce0 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 28 Aug 2016 22:54:22 +0100
Subject: Read optional attributes of comments

---
 .../org/zwobble/mammoth/internal/docx/CommentXmlReader.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java
index 1740ec2..1b6a171 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/CommentXmlReader.java
@@ -28,8 +28,17 @@ public class CommentXmlReader {
             .map(children -> new Comment(
                 commentId,
                 children,
-                Optional.empty(),
-                Optional.empty()
+                readOptionalAttribute(element, "w:author"),
+                readOptionalAttribute(element, "w:initials")
             ));
     }
+
+    private Optional<String> readOptionalAttribute(XmlElement element, String name) {
+        String value = element.getAttributeOrNone(name).orElse("").trim();
+        if (value.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return Optional.of(value);
+        }
+    }
 }
-- 
cgit v1.2.3