From 150bedb37750e80d598f7072f55ce7487e257216 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 26 Mar 2016 11:25:42 +0000 Subject: Remove more usages of Guava collections --- .../zwobble/mammoth/internal/styles/StyleMapBuilder.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java') diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java index 34a72ba..9935417 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java @@ -1,9 +1,10 @@ package org.zwobble.mammoth.internal.styles; -import com.google.common.collect.ImmutableList; import org.zwobble.mammoth.internal.documents.Paragraph; import org.zwobble.mammoth.internal.documents.Run; +import java.util.ArrayList; +import java.util.List; import java.util.Optional; public class StyleMapBuilder { @@ -11,8 +12,8 @@ public class StyleMapBuilder { private Optional strikethrough; private Optional bold; private Optional italic; - private final ImmutableList.Builder> paragraphStyles = ImmutableList.builder(); - private final ImmutableList.Builder> runStyles = ImmutableList.builder(); + private final List> paragraphStyles = new ArrayList<>(); + private final List> runStyles = new ArrayList<>(); public StyleMapBuilder() { this.bold = Optional.empty(); @@ -42,16 +43,16 @@ public class StyleMapBuilder { } public StyleMapBuilder mapParagraph(ParagraphMatcher matcher, HtmlPath path) { - paragraphStyles.add(new StyleMapping(matcher, path)); + paragraphStyles.add(new StyleMapping<>(matcher, path)); return this; } public StyleMapBuilder mapRun(RunMatcher matcher, HtmlPath path) { - runStyles.add(new StyleMapping(matcher, path)); + runStyles.add(new StyleMapping<>(matcher, path)); return this; } public StyleMap build() { - return new StyleMap(bold, italic, underline, strikethrough, paragraphStyles.build(), runStyles.build()); + return new StyleMap(bold, italic, underline, strikethrough, paragraphStyles, runStyles); } } -- cgit v1.2.3