From 39cbfae7358faaff8f876641869492c366ce1218 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Fri, 25 Mar 2016 15:47:55 +0000
Subject: Add MammothMaps.entry

---
 .../java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java   | 6 +++---
 src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java | 8 ++++----
 .../java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java  | 4 ++--
 src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java    | 4 ++--
 src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java  | 5 +++++
 5 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
index 4a7d3bd..20bb0ab 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
@@ -5,7 +5,7 @@ import org.zwobble.mammoth.internal.xml.XmlElementList;
 
 import java.util.Map;
 
-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.toMap;
 import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
 
@@ -21,7 +21,7 @@ public class ContentTypesXml {
     }
 
     private static Map.Entry<String, String> readDefault(XmlElement element) {
-        return immutableEntry(
+        return entry(
             element.getAttribute("Extension"),
             element.getAttribute("ContentType"));
     }
@@ -31,7 +31,7 @@ public class ContentTypesXml {
     }
 
     private static Map.Entry<String, String> readOverride(XmlElement element) {
-        return immutableEntry(
+        return entry(
             trimLeft(element.getAttribute("PartName"), '/'),
             element.getAttribute("ContentType"));
     }
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());
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
index 938776e..0c65e55 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
@@ -4,7 +4,7 @@ import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Map;
 
-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.toMap;
 
 public class RelationshipsXml {
@@ -15,7 +15,7 @@ public class RelationshipsXml {
     }
 
     private static Map.Entry<String, Relationship> readRelationship(XmlElement element) {
-        return immutableEntry(
+        return entry(
             element.getAttribute("Id"),
             new Relationship(element.getAttribute("Target")));
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
index 78ba65f..9b468fe 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.Iterables.filter;
-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.toMap;
 
 public class StylesXml {
@@ -28,6 +28,6 @@ public class StylesXml {
     private static Map.Entry<String, Style> readStyle(XmlElement element) {
         String styleId = element.getAttribute("w:styleId");
         Optional<String> styleName = element.findChildOrEmpty("w:name").getAttributeOrNone("w:val");
-        return immutableEntry(styleId, new Style(styleId, styleName));
+        return entry(styleId, new Style(styleId, styleName));
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
index 2f098ce..19fbfc4 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
@@ -2,6 +2,7 @@ package org.zwobble.mammoth.internal.util;
 
 import com.google.common.collect.ImmutableMap;
 
+import java.util.AbstractMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
@@ -23,6 +24,10 @@ public class MammothMaps {
         return ImmutableMap.of(key1, value1, key2, value2, key3, value3);
     }
 
+    public static <K, V> Map.Entry<K, V> entry(K key, V value) {
+        return new AbstractMap.SimpleImmutableEntry<K, V>(key, value);
+    }
+
     public static <K, V> Optional<V> lookup(Map<K, V> map, K key) {
         return Optional.ofNullable(map.get(key));
     }
-- 
cgit v1.2.3