From f61e177abb96034353572e5c32df0a8ae671a4d5 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 20 Feb 2016 15:39:19 +0000 Subject: Produce warnings for unrecognised styles --- src/main/java/org/zwobble/mammoth/styles/StyleMap.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/styles/StyleMap.java') diff --git a/src/main/java/org/zwobble/mammoth/styles/StyleMap.java b/src/main/java/org/zwobble/mammoth/styles/StyleMap.java index e498246..7aae7df 100644 --- a/src/main/java/org/zwobble/mammoth/styles/StyleMap.java +++ b/src/main/java/org/zwobble/mammoth/styles/StyleMap.java @@ -4,6 +4,7 @@ import com.google.common.collect.Iterables; import org.zwobble.mammoth.documents.Paragraph; import java.util.List; +import java.util.Optional; public class StyleMap { public static StyleMapBuilder builder() { @@ -30,9 +31,9 @@ public class StyleMap { return strikethrough; } - public HtmlPath getParagraphStyleMapping(Paragraph paragraph) { - return Iterables.tryFind(paragraphStyles, styleMapping -> styleMapping.matches(paragraph)) - .transform(StyleMapping::getHtmlPath) - .or(HtmlPath.element("p")); + public Optional getParagraphHtmlPath(Paragraph paragraph) { + com.google.common.base.Optional mapping = Iterables.tryFind(paragraphStyles, styleMapping -> styleMapping.matches(paragraph)); + return Optional.ofNullable(mapping.orNull()) + .map(StyleMapping::getHtmlPath); } } -- cgit v1.2.3