aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-03-25 15:47:55 +0000
committerMichael Williamson <mike@zwobble.org>2016-03-25 15:47:55 +0000
commit39cbfae7358faaff8f876641869492c366ce1218 (patch)
tree7e9c984e03a2b5d81b9b3493a41bf3cc08079a5c /src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
parentf7645cf2f00322b046294fa944bb67b862c4bb16 (diff)
Add MammothMaps.entry
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
index 083f116..2167171 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -7,7 +7,7 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
import java.util.Map;
import java.util.Optional;
-import static com.google.common.collect.Maps.immutableEntry;
+import static org.zwobble.mammoth.internal.util.MammothMaps.entry;
import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
@@ -24,7 +24,7 @@ public class NumberingXml {
private static Map.Entry<String, Map<String, NumberingLevel>> readAbstractNum(XmlElement element) {
// TODO: in python-mammoth, we allow None here. Check whether that's actually possible or not
String abstractNumId = element.getAttribute("w:abstractNumId");
- return immutableEntry(abstractNumId, readAbstractNumLevels(element));
+ return entry(abstractNumId, readAbstractNumLevels(element));
}
private static Map<String, NumberingLevel> readAbstractNumLevels(XmlElement element) {
@@ -35,7 +35,7 @@ public class NumberingXml {
String levelIndex = element.getAttribute("w:ilvl");
Optional<String> numFmt = element.findChildOrEmpty("w:numFmt").getAttributeOrNone("w:val");
boolean isOrdered = !numFmt.equals(Optional.of("bullet"));
- return immutableEntry(levelIndex, new NumberingLevel(levelIndex, isOrdered));
+ return entry(levelIndex, new NumberingLevel(levelIndex, isOrdered));
}
private static Map<String, Map<String, NumberingLevel>> readNums(
@@ -52,6 +52,6 @@ public class NumberingXml {
// TODO: in python-mammoth, we allow None here. Check whether that's actually possible or not
String numId = numElement.getAttribute("w:numId");
String abstractNumId = numElement.findChild("w:abstractNumId").getAttribute("w:val");
- return immutableEntry(numId, lookup(abstractNums, abstractNumId).get());
+ return entry(numId, lookup(abstractNums, abstractNumId).get());
}
}