From a9efb5601c128b83f5f759a837fd989e108dc61f Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 17 Mar 2019 18:41:35 +0000 Subject: Create object for abstract nums --- src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java') 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 33e5e27..0ab12b4 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java @@ -12,19 +12,19 @@ import static org.zwobble.mammoth.internal.util.Maps.toMap; public class NumberingXml { public static Numbering readNumberingXmlElement(XmlElement element) { - Map> abstractNums = readAbstractNums(element.findChildren("w:abstractNum")); + Map abstractNums = readAbstractNums(element.findChildren("w:abstractNum")); Map nums = readNums(element.findChildren("w:num")); return new Numbering(abstractNums, nums); } - private static Map> readAbstractNums(XmlElementList children) { + private static Map readAbstractNums(XmlElementList children) { return toMap(children, NumberingXml::readAbstractNum); } - private static Map.Entry> readAbstractNum(XmlElement element) { + private static Map.Entry 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 entry(abstractNumId, readAbstractNumLevels(element)); + return entry(abstractNumId, new Numbering.AbstractNum(readAbstractNumLevels(element))); } private static Map readAbstractNumLevels(XmlElement element) { -- cgit v1.2.3