aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-03-25 16:03:36 +0000
committerMichael Williamson <mike@zwobble.org>2016-03-25 16:03:36 +0000
commit5b2235620d33776d0a1dcae8f9e68693d9390be3 (patch)
treede929f0030bc2a9371e3426115d72e7bea13c8ea /src/main
parent39cbfae7358faaff8f876641869492c366ce1218 (diff)
Prefer Java stdlib classes to Guava
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/zwobble/mammoth/DocumentConverter.java2
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
index abd99bb..faa45ef 100644
--- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java
+++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
@@ -1,6 +1,5 @@
package org.zwobble.mammoth;
-import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import org.zwobble.mammoth.internal.DocumentToHtml;
import org.zwobble.mammoth.internal.DocumentToHtmlOptions;
@@ -21,6 +20,7 @@ import java.io.InputStream;
import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
+import java.util.function.Function;
import java.util.zip.ZipFile;
import static org.zwobble.mammoth.internal.docx.DocumentReader.readDocument;
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 8b95973..105d348 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
@@ -1,6 +1,5 @@
package org.zwobble.mammoth.internal.xml;
-import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import java.util.List;
@@ -45,7 +44,7 @@ public class XmlElement implements XmlNode, XmlElementLike {
@Override
public String innerText() {
- return Joiner.on("").join(transform(children, XmlNode::innerText));
+ return String.join("", transform(children, XmlNode::innerText));
}
@Override