From af02f10154d6acc75327b96c220110a9abe54834 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 26 Mar 2016 09:36:51 +0000
Subject: Rename concat to flatten if taking an iterable

---
 src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java    | 4 ++--
 src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java   | 2 +-
 src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java       | 2 +-
 .../java/org/zwobble/mammoth/internal/results/InternalResult.java     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main')

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 6f705bb..bf7321e 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -172,7 +172,7 @@ public class BodyXmlReader {
     }
 
     public ReadResult readElements(Iterable<XmlNode> nodes) {
-        return ReadResult.concat(
+        return ReadResult.flatten(
             lazyMap(
                 filter(nodes, XmlElement.class),
                 this::readElement));
@@ -286,7 +286,7 @@ public class BodyXmlReader {
     }
 
     private ReadResult readBlips(XmlElementList blips, Optional<String> altText) {
-        return ReadResult.concat(lazyMap(blips, blip -> readBlip(blip, altText)));
+        return ReadResult.flatten(lazyMap(blips, blip -> readBlip(blip, altText)));
     }
 
     private ReadResult readBlip(XmlElement blip, Optional<String> altText) {
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 40219b0..9772563 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
@@ -31,7 +31,7 @@ public class NotesXmlReader {
 
     public InternalResult<List<Note>> readElement(XmlElement element) {
         Iterable<XmlElement> elements = filter(element.findChildren("w:" + tagName), this::isNoteElement);
-        return InternalResult.concat(lazyMap(elements, this::readNoteElement));
+        return InternalResult.flatten(lazyMap(elements, this::readNoteElement));
     }
 
     private boolean isNoteElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
index 65cd3b0..1045054 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
@@ -17,7 +17,7 @@ import static org.zwobble.mammoth.internal.util.MammothLists.toList;
 public class ReadResult {
     public static final ReadResult EMPTY_SUCCESS = success(list());
 
-    public static ReadResult concat(Iterable<ReadResult> results) {
+    public static ReadResult flatten(Iterable<ReadResult> results) {
         results = toList(results);
         return new ReadResult(
             eagerFlatMap(results, result -> result.elements),
diff --git a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
index b4c3791..650446f 100644
--- a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java
@@ -17,7 +17,7 @@ import static org.zwobble.mammoth.internal.util.MammothLists.list;
 import static org.zwobble.mammoth.internal.util.MammothLists.toList;
 
 public class InternalResult<T> {
-    public static <T> InternalResult<List<T>> concat(Iterable<InternalResult<T>> results) {
+    public static <T> InternalResult<List<T>> flatten(Iterable<InternalResult<T>> results) {
         results = toList(results);
         return new InternalResult<>(
             eagerMap(results, result -> result.value),
-- 
cgit v1.2.3