From cf6808f01f8aff295548f2de62b86498e4996141 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 13 Feb 2016 18:22:02 +0000 Subject: Add warnings to results --- src/main/java/org/zwobble/mammoth/docx/ReadResult.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/docx/ReadResult.java') diff --git a/src/main/java/org/zwobble/mammoth/docx/ReadResult.java b/src/main/java/org/zwobble/mammoth/docx/ReadResult.java index f3eb7ce..9fd2e6c 100644 --- a/src/main/java/org/zwobble/mammoth/docx/ReadResult.java +++ b/src/main/java/org/zwobble/mammoth/docx/ReadResult.java @@ -1,8 +1,9 @@ package org.zwobble.mammoth.docx; import com.google.common.collect.ImmutableList; -import org.zwobble.mammoth.Result; +import org.zwobble.mammoth.results.Result; import org.zwobble.mammoth.documents.DocumentElement; +import org.zwobble.mammoth.results.Warning; import java.util.List; import java.util.function.Function; @@ -14,10 +15,12 @@ public class ReadResult { public static ReadResult concat(Iterable results) { ImmutableList.Builder elements = ImmutableList.builder(); + ImmutableList.Builder warnings = ImmutableList.builder(); for (ReadResult result : results) { elements.addAll(result.elements); + warnings.addAll(result.warnings); } - return new ReadResult(elements.build()); + return new ReadResult(elements.build(), warnings.build()); } public static ReadResult success(DocumentElement element) { @@ -25,20 +28,22 @@ public class ReadResult { } public static ReadResult success(List elements) { - return new ReadResult(elements); + return new ReadResult(elements, list()); } private final List elements; + private final List warnings; - public ReadResult(List elements) { + public ReadResult(List elements, List warnings) { this.elements = elements; + this.warnings = warnings; } public ReadResult map(Function, DocumentElement> function) { - return new ReadResult(list(function.apply(elements))); + return new ReadResult(list(function.apply(elements)), warnings); } public Result> toResult() { - return new Result<>(elements); + return new Result<>(elements, warnings); } } -- cgit v1.2.3