Remove XmlElement.children

5 files changed, 12 insertions, 16 deletions

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 47034cc..5d16704 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -62,9 +62,9 @@ public class BodyXmlReader {
                 return readBreak(element);
 
             case "w:tbl":
-                return readElements(element.children()).map(Table::new);
+                return readElements(element.getChildren()).map(Table::new);
             case "w:tr":
-                return readElements(element.children()).map(TableRow::new);
+                return readElements(element.getChildren()).map(TableRow::new);
             case "w:tc":
                 return readTableCell(element);
 
@@ -94,7 +94,7 @@ public class BodyXmlReader {
             case "v:shape":
             case "v:textbox":
             case "w:txbxContent":
-                return readElements(element.children());
+                return readElements(element.getChildren());
 
             case "office-word:wrap":
             case "v:shadow":
@@ -126,7 +126,7 @@ public class BodyXmlReader {
         XmlElementLike properties = element.findChildOrEmpty("w:rPr");
         return ReadResult.map(
             readRunStyle(properties),
-            readElements(element.children()),
+            readElements(element.getChildren()),
             (style, children) -> new Run(
                 isBold(properties),
                 isItalic(properties),
@@ -179,7 +179,7 @@ public class BodyXmlReader {
         Optional<NumberingLevel> numbering = readNumbering(properties);
         return ReadResult.map(
             readParagraphStyle(properties),
-            readElements(element.children()),
+            readElements(element.getChildren()),
             (style, children) -> new Paragraph(style, numbering, children)).appendExtra();
     }
 
@@ -237,13 +237,13 @@ public class BodyXmlReader {
             .findChildOrEmpty("w:gridSpan")
             .getAttributeOrNone("w:val");
         int colspan = gridSpan.map(Integer::parseInt).orElse(1);
-        return readElements(element.children()).map(children -> new TableCell(colspan, children));
+        return readElements(element.getChildren()).map(children -> new TableCell(colspan, children));
     }
 
     private ReadResult readHyperlink(XmlElement element) {
         Optional<String> relationshipId = element.getAttributeOrNone("r:id");
         Optional<String> anchor = element.getAttributeOrNone("w:anchor");
-        ReadResult childrenResult = readElements(element.children());
+        ReadResult childrenResult = readElements(element.getChildren());
         if (relationshipId.isPresent()) {
             return childrenResult.map(children -> Hyperlink.href(
                 relationships.findRelationshipById(relationshipId.get()).getTarget(), children));
@@ -270,7 +270,7 @@ public class BodyXmlReader {
     }
 
     private ReadResult readPict(XmlElement element) {
-        return readElements(element.children()).toExtra();
+        return readElements(element.getChildren()).toExtra();
     }
 
     private ReadResult readImagedata(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
index be4f474..117ae34 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
@@ -16,7 +16,7 @@ public class DocumentXmlReader {
 
     public InternalResult<Document> readElement(XmlElement element) {
         XmlElement body = element.findChild("w:body");
-        return bodyReader.readElements(body.children())
+        return bodyReader.readElements(body.getChildren())
             .toResult()
             .map(children -> new Document(children, notes));
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
index e70b1d4..de02960 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
@@ -44,7 +44,7 @@ public class NotesXmlReader {
     }
 
     private InternalResult<Note> readNoteElement(XmlElement element) {
-        return bodyReader.readElements(element.children())
+        return bodyReader.readElements(element.getChildren())
             .toResult()
             .map(children -> new Note(
                 noteType,
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
index b3a90d6..e38f2f2 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
@@ -38,7 +38,7 @@ public class OfficeXml {
                     XmlElement collapsedElement = new XmlElement(
                         element.getName(),
                         element.getAttributes(),
-                        eagerFlatMap(element.children(), OfficeXml::collapseAlternateContent));
+                        eagerFlatMap(element.getChildren(), OfficeXml::collapseAlternateContent));
                     return list(collapsedElement);
                 }
             }
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
index 2910fd0..cd72494 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
@@ -37,10 +37,6 @@ public class XmlElement implements XmlNode, XmlElementLike {
         return lookup(attributes, name);
     }
 
-    public List<XmlNode> getChildren() {
-        return children;
-    }
-
     @Override
     public String innerText() {
         return String.join("", lazyMap(children, XmlNode::innerText));
@@ -51,7 +47,7 @@ public class XmlElement implements XmlNode, XmlElementLike {
         return visitor.visit(this);
     }
 
-    public Iterable<XmlNode> children() {
+    public List<XmlNode> getChildren() {
         return children;
     }