diff options
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/Mammoth.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java (renamed from src/main/java/org/zwobble/mammoth/internal/DocumentConverter.java) | 8 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/org/zwobble/mammoth/Mammoth.java b/src/main/java/org/zwobble/mammoth/Mammoth.java index d7f5679..e979afc 100644 --- a/src/main/java/org/zwobble/mammoth/Mammoth.java +++ b/src/main/java/org/zwobble/mammoth/Mammoth.java @@ -2,7 +2,7 @@ package org.zwobble.mammoth; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import org.zwobble.mammoth.internal.DocumentConverter; +import org.zwobble.mammoth.internal.DocumentToHtml; import org.zwobble.mammoth.internal.DocumentToHtmlOptions; import org.zwobble.mammoth.internal.documents.DocumentElement; import org.zwobble.mammoth.internal.documents.HasChildren; @@ -62,7 +62,7 @@ public class Mammoth { private Result<String> convertToHtml(Optional<Path> path, DocxFile zipFile) { return readDocument(path, zipFile) - .flatMap(nodes -> DocumentConverter.convertToHtml(nodes, options)) + .flatMap(nodes -> DocumentToHtml.convertToHtml(nodes, options)) .map(Html::stripEmpty) .map(Html::collapse) .map(Html::write); diff --git a/src/main/java/org/zwobble/mammoth/internal/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java index 4e5dc05..b501800 100644 --- a/src/main/java/org/zwobble/mammoth/internal/DocumentConverter.java +++ b/src/main/java/org/zwobble/mammoth/internal/DocumentToHtml.java @@ -23,9 +23,9 @@ import static org.zwobble.mammoth.results.Warning.warning; import static org.zwobble.mammoth.internal.util.MammothLists.*; import static org.zwobble.mammoth.internal.util.MammothMaps.map; -public class DocumentConverter { +public class DocumentToHtml { public static Result<List<HtmlNode>> convertToHtml(Document document, DocumentToHtmlOptions options) { - DocumentConverter documentConverter = new DocumentConverter(options); + DocumentToHtml documentConverter = new DocumentToHtml(options); return new Result<>( documentConverter.convertToHtml(document), documentConverter.warnings.build()); @@ -39,7 +39,7 @@ public class DocumentConverter { } public static Result<List<HtmlNode>> convertToHtml(DocumentElement element, DocumentToHtmlOptions options) { - DocumentConverter documentConverter = new DocumentConverter(options); + DocumentToHtml documentConverter = new DocumentToHtml(options); return new Result<>( documentConverter.convertToHtml(element), documentConverter.warnings.build()); @@ -51,7 +51,7 @@ public class DocumentConverter { private final List<NoteReference> noteReferences = new ArrayList<>(); private final ImmutableList.Builder<Warning> warnings = ImmutableList.builder(); - private DocumentConverter(DocumentToHtmlOptions options) { + private DocumentToHtml(DocumentToHtmlOptions options) { this.idPrefix = options.idPrefix(); this.preserveEmptyParagraphs = options.shouldPreserveEmptyParagraphs(); this.styleMap = options.styleMap(); diff --git a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java index df60d06..6a4c036 100644 --- a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java @@ -1,7 +1,7 @@ package org.zwobble.mammoth.tests; import org.junit.Test; -import org.zwobble.mammoth.internal.DocumentConverter; +import org.zwobble.mammoth.internal.DocumentToHtml; import org.zwobble.mammoth.internal.DocumentToHtmlOptions; import org.zwobble.mammoth.internal.documents.*; import org.zwobble.mammoth.internal.html.Html; @@ -42,7 +42,7 @@ public class DocumentConverterTests { public void forceWriteIsInsertedIntoParagraphIfEmptyParagraphsShouldBePreserved() { DocumentToHtmlOptions options = DocumentToHtmlOptions.DEFAULT.preserveEmptyParagraphs(); assertThat( - DocumentConverter.convertToHtml(make(a(PARAGRAPH)), options), + DocumentToHtml.convertToHtml(make(a(PARAGRAPH)), options), deepEquals(success(list(Html.element("p", list(Html.FORCE_WRITE)))))); } @@ -290,7 +290,7 @@ public class DocumentConverterTests { private List<HtmlNode> convertToHtml(Document document) { DocumentToHtmlOptions options = DocumentToHtmlOptions.DEFAULT .idPrefix("doc-42-"); - Result<List<HtmlNode>> result = DocumentConverter.convertToHtml(document, options); + Result<List<HtmlNode>> result = DocumentToHtml.convertToHtml(document, options); assertThat(result.getWarnings(), hasSize(0)); return result.getValue(); } @@ -313,6 +313,6 @@ public class DocumentConverterTests { DocumentToHtmlOptions options = DocumentToHtmlOptions.DEFAULT .idPrefix("doc-42-") .addStyleMap(styleMap); - return DocumentConverter.convertToHtml(element, options); + return DocumentToHtml.convertToHtml(element, options); } } |