diff options
Diffstat (limited to 'src/main/java/org')
6 files changed, 18 insertions, 41 deletions
diff --git a/src/main/java/org/zwobble/mammoth/Result.java b/src/main/java/org/zwobble/mammoth/Result.java index 486d155..2660fd4 100644 --- a/src/main/java/org/zwobble/mammoth/Result.java +++ b/src/main/java/org/zwobble/mammoth/Result.java @@ -1,10 +1,8 @@ package org.zwobble.mammoth; -import org.zwobble.mammoth.internal.results.Warning; - import java.util.List; public interface Result<T> { T getValue(); - List<Warning> getWarnings(); + List<String> getWarnings(); } diff --git a/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java index 6c4961a..45ff92e 100644 --- a/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java +++ b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java @@ -8,7 +8,6 @@ import org.zwobble.mammoth.internal.documents.*; import org.zwobble.mammoth.internal.html.Html; import org.zwobble.mammoth.internal.html.HtmlNode; import org.zwobble.mammoth.internal.results.InternalResult; -import org.zwobble.mammoth.internal.results.Warning; import org.zwobble.mammoth.internal.styles.HtmlPath; import org.zwobble.mammoth.internal.styles.StyleMap; import org.zwobble.mammoth.internal.util.MammothLists; @@ -19,7 +18,6 @@ import java.util.Base64; import java.util.List; import java.util.Map; -import static org.zwobble.mammoth.internal.results.Warning.warning; import static org.zwobble.mammoth.internal.util.MammothLists.*; import static org.zwobble.mammoth.internal.util.MammothMaps.map; @@ -49,7 +47,7 @@ public class DocumentToHtml { private final boolean preserveEmptyParagraphs; private final StyleMap styleMap; private final List<NoteReference> noteReferences = new ArrayList<>(); - private final ImmutableList.Builder<Warning> warnings = ImmutableList.builder(); + private final ImmutableList.Builder<String> warnings = ImmutableList.builder(); private DocumentToHtml(DocumentToHtmlOptions options) { this.idPrefix = options.idPrefix(); @@ -103,7 +101,7 @@ public class DocumentToHtml { HtmlPath mapping = styleMap.getParagraphHtmlPath(paragraph) .orElseGet(() -> { if (paragraph.getStyle().isPresent()) { - warnings.add(warning("Unrecognised paragraph style: " + paragraph.getStyle().get().describe())); + warnings.add("Unrecognised paragraph style: " + paragraph.getStyle().get().describe()); } return HtmlPath.element("p"); }); @@ -134,7 +132,7 @@ public class DocumentToHtml { HtmlPath mapping = styleMap.getRunHtmlPath(run) .orElseGet(() -> { if (run.getStyle().isPresent()) { - warnings.add(warning("Unrecognised run style: " + run.getStyle().get().describe())); + warnings.add("Unrecognised run style: " + run.getStyle().get().describe()); } return HtmlPath.EMPTY; }); @@ -224,7 +222,7 @@ public class DocumentToHtml { return list(Html.selfClosingElement("img", attributes.build())); } catch (IOException exception) { - warnings.add(warning(exception.getMessage())); + warnings.add(exception.getMessage()); return MammothLists.<HtmlNode>list(); } }) diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java index c8aa57e..0edc7a7 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java @@ -3,7 +3,6 @@ package org.zwobble.mammoth.internal.docx; import com.google.common.collect.ImmutableSet; import org.zwobble.mammoth.internal.documents.*; import org.zwobble.mammoth.internal.results.InternalResult; -import org.zwobble.mammoth.internal.results.Warning; import org.zwobble.mammoth.internal.util.InputStreamSupplier; import org.zwobble.mammoth.internal.util.MammothOptionals; import org.zwobble.mammoth.internal.xml.XmlElement; @@ -19,7 +18,6 @@ import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.transform; import static org.zwobble.mammoth.internal.docx.ReadResult.EMPTY_SUCCESS; import static org.zwobble.mammoth.internal.docx.ReadResult.success; -import static org.zwobble.mammoth.internal.results.Warning.warning; import static org.zwobble.mammoth.internal.util.MammothLists.list; import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft; @@ -120,7 +118,7 @@ public class BodyXmlReader { return EMPTY_SUCCESS; default: - Warning warning = warning("An unrecognised element was ignored: " + element.getName()); + String warning = "An unrecognised element was ignored: " + element.getName(); return ReadResult.emptyWithWarning(warning); } } @@ -215,7 +213,7 @@ public class BodyXmlReader { } else { return new InternalResult<>( Optional.of(new Style(styleId, Optional.empty())), - list(warning(styleType + " style with ID " + styleId + " was referenced but not defined in the document"))); + list(styleType + " style with ID " + styleId + " was referenced but not defined in the document")); } } @@ -233,7 +231,7 @@ public class BodyXmlReader { if (breakType.equals("")) { return success(LineBreak.LINE_BREAK); } else { - return ReadResult.emptyWithWarning(warning("Unsupported break type: " + breakType)); + return ReadResult.emptyWithWarning("Unsupported break type: " + breakType); } } @@ -314,7 +312,7 @@ public class BodyXmlReader { if (IMAGE_TYPES_SUPPORTED_BY_BROWSERS.contains(contentTypeString)) { return success(image); } else { - return ReadResult.withWarning(image, warning("Image of type " + contentTypeString + " is unlikely to display in web browsers")); + return ReadResult.withWarning(image, "Image of type " + contentTypeString + " is unlikely to display in web browsers"); } } diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java index b9e4ec9..b390649 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java @@ -3,7 +3,6 @@ package org.zwobble.mammoth.internal.docx; import com.google.common.collect.ImmutableList; import org.zwobble.mammoth.internal.documents.DocumentElement; import org.zwobble.mammoth.internal.results.InternalResult; -import org.zwobble.mammoth.internal.results.Warning; import java.util.List; import java.util.function.BiFunction; @@ -17,7 +16,7 @@ public class ReadResult { public static ReadResult concat(Iterable<ReadResult> results) { ImmutableList.Builder<DocumentElement> elements = ImmutableList.builder(); ImmutableList.Builder<DocumentElement> extra = ImmutableList.builder(); - ImmutableList.Builder<Warning> warnings = ImmutableList.builder(); + ImmutableList.Builder<String> warnings = ImmutableList.builder(); for (ReadResult result : results) { elements.addAll(result.elements); extra.addAll(result.extra); @@ -45,19 +44,19 @@ public class ReadResult { return new ReadResult(elements, list(), list()); } - public static ReadResult emptyWithWarning(Warning warning) { + public static ReadResult emptyWithWarning(String warning) { return new ReadResult(list(), list(), list(warning)); } - public static ReadResult withWarning(DocumentElement element, Warning warning) { + public static ReadResult withWarning(DocumentElement element, String warning) { return new ReadResult(list(element), list(), list(warning)); } private final List<DocumentElement> elements; private final List<DocumentElement> extra; - private final List<Warning> warnings; + private final List<String> warnings; - public ReadResult(List<DocumentElement> elements, List<DocumentElement> extra, List<Warning> warnings) { + public ReadResult(List<DocumentElement> elements, List<DocumentElement> extra, List<String> warnings) { this.elements = elements; this.extra = extra; this.warnings = warnings; diff --git a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java index b3c9ec7..279692b 100644 --- a/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java +++ b/src/main/java/org/zwobble/mammoth/internal/results/InternalResult.java @@ -14,7 +14,7 @@ import static org.zwobble.mammoth.internal.util.MammothLists.list; public class InternalResult<T> implements org.zwobble.mammoth.Result<T> { public static <T> InternalResult<List<T>> concat(Iterable<InternalResult<T>> results) { ImmutableList.Builder<T> elements = ImmutableList.builder(); - ImmutableList.Builder<Warning> warnings = ImmutableList.builder(); + ImmutableList.Builder<String> warnings = ImmutableList.builder(); for (InternalResult<T> result : results) { elements.add(result.value); warnings.addAll(result.warnings); @@ -41,9 +41,9 @@ public class InternalResult<T> implements org.zwobble.mammoth.Result<T> { } private final T value; - private final List<Warning> warnings; + private final List<String> warnings; - public InternalResult(T value, List<Warning> warnings) { + public InternalResult(T value, List<String> warnings) { this.value = value; this.warnings = warnings; } @@ -52,7 +52,7 @@ public class InternalResult<T> implements org.zwobble.mammoth.Result<T> { return value; } - public List<Warning> getWarnings() { + public List<String> getWarnings() { return warnings; } diff --git a/src/main/java/org/zwobble/mammoth/internal/results/Warning.java b/src/main/java/org/zwobble/mammoth/internal/results/Warning.java deleted file mode 100644 index 062860f..0000000 --- a/src/main/java/org/zwobble/mammoth/internal/results/Warning.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.zwobble.mammoth.internal.results; - -public class Warning { - public static Warning warning(String message) { - return new Warning(message); - } - private final String message; - - private Warning(String message) { - this.message = message; - } - - public String getMessage() { - return message; - } -} |