From 98a94a032f08e9f1d0ad6a07ea45ef539dd8eac9 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 2 Jan 2016 22:32:32 +0000
Subject: Use Style class in Paragraph

---
 src/main/java/org/zwobble/mammoth/docx/BodyXml.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXml.java b/src/main/java/org/zwobble/mammoth/docx/BodyXml.java
index 8aba487..df98fbc 100644
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXml.java
+++ b/src/main/java/org/zwobble/mammoth/docx/BodyXml.java
@@ -1,10 +1,7 @@
 package org.zwobble.mammoth.docx;
 
 import com.google.common.collect.ImmutableList;
-import org.zwobble.mammoth.documents.DocumentElement;
-import org.zwobble.mammoth.documents.ParagraphElement;
-import org.zwobble.mammoth.documents.RunElement;
-import org.zwobble.mammoth.documents.TextElement;
+import org.zwobble.mammoth.documents.*;
 import org.zwobble.mammoth.xml.XmlElement;
 import org.zwobble.mammoth.xml.XmlElementLike;
 import org.zwobble.mammoth.xml.XmlNode;
@@ -39,12 +36,13 @@ public class BodyXml {
     }
 
     private static ParagraphElement readParagraph(XmlElement element) {
-        return new ParagraphElement(readParagraphStyleId(element), readElements(element.children()));
+        return new ParagraphElement(readParagraphStyle(element), readElements(element.children()));
     }
 
-    private static Optional<String> readParagraphStyleId(XmlElement paragraph) {
+    private static Optional<Style> readParagraphStyle(XmlElement paragraph) {
         XmlElementLike properties = paragraph.findChildOrEmpty("w:pPr");
-        return properties.findChildOrEmpty("w:pStyle").getAttributeOrNone("w:val");
+        return properties.findChildOrEmpty("w:pStyle").getAttributeOrNone("w:val")
+            .map(styleId -> new Style(styleId, Optional.empty()));
     }
 
     private static List<DocumentElement> readElements(Iterable<XmlNode> nodes) {
-- 
cgit v1.2.3