diff options
Diffstat (limited to 'src')
13 files changed, 24 insertions, 9 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java b/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java index c5ba826..2c108f2 100644 --- a/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java +++ b/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java @@ -6,10 +6,10 @@ import org.zwobble.mammoth.internal.documents.DocumentElement; import org.zwobble.mammoth.internal.documents.HasChildren; import org.zwobble.mammoth.internal.documents.Paragraph; import org.zwobble.mammoth.internal.documents.Text; -import org.zwobble.mammoth.internal.docx.Archive; +import org.zwobble.mammoth.internal.archives.Archive; import org.zwobble.mammoth.internal.docx.EmbeddedStyleMap; -import org.zwobble.mammoth.internal.docx.InMemoryArchive; -import org.zwobble.mammoth.internal.docx.ZippedArchive; +import org.zwobble.mammoth.internal.archives.InMemoryArchive; +import org.zwobble.mammoth.internal.archives.ZippedArchive; import org.zwobble.mammoth.internal.html.Html; import org.zwobble.mammoth.internal.results.InternalResult; import org.zwobble.mammoth.internal.styles.StyleMap; diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Archive.java b/src/main/java/org/zwobble/mammoth/internal/archives/Archive.java index 8354662..4440234 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/Archive.java +++ b/src/main/java/org/zwobble/mammoth/internal/archives/Archive.java @@ -1,4 +1,4 @@ -package org.zwobble.mammoth.internal.docx; +package org.zwobble.mammoth.internal.archives; import java.io.Closeable; import java.io.IOException; diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Archives.java b/src/main/java/org/zwobble/mammoth/internal/archives/Archives.java index 519520a..e0322fb 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/Archives.java +++ b/src/main/java/org/zwobble/mammoth/internal/archives/Archives.java @@ -1,4 +1,4 @@ -package org.zwobble.mammoth.internal.docx; +package org.zwobble.mammoth.internal.archives; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryArchive.java b/src/main/java/org/zwobble/mammoth/internal/archives/InMemoryArchive.java index 6d164f4..9ad7134 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryArchive.java +++ b/src/main/java/org/zwobble/mammoth/internal/archives/InMemoryArchive.java @@ -1,4 +1,4 @@ -package org.zwobble.mammoth.internal.docx; +package org.zwobble.mammoth.internal.archives; import org.zwobble.mammoth.internal.util.PassThroughException; import org.zwobble.mammoth.internal.util.Streams; diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/MutableArchive.java b/src/main/java/org/zwobble/mammoth/internal/archives/MutableArchive.java index 5615d58..d32da20 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/MutableArchive.java +++ b/src/main/java/org/zwobble/mammoth/internal/archives/MutableArchive.java @@ -1,4 +1,6 @@ -package org.zwobble.mammoth.internal.docx; +package org.zwobble.mammoth.internal.archives; + +import org.zwobble.mammoth.internal.archives.Archive; public interface MutableArchive extends Archive { diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ZippedArchive.java b/src/main/java/org/zwobble/mammoth/internal/archives/ZippedArchive.java index 27e7fa4..32b8894 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/ZippedArchive.java +++ b/src/main/java/org/zwobble/mammoth/internal/archives/ZippedArchive.java @@ -1,4 +1,6 @@ -package org.zwobble.mammoth.internal.docx; +package org.zwobble.mammoth.internal.archives; + +import org.zwobble.mammoth.internal.archives.Archive; import java.io.File; import java.io.IOException; 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 ec2d3c1..ba09182 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java @@ -1,5 +1,7 @@ package org.zwobble.mammoth.internal.docx; +import org.zwobble.mammoth.internal.archives.Archive; +import org.zwobble.mammoth.internal.archives.Archives; import org.zwobble.mammoth.internal.documents.*; import org.zwobble.mammoth.internal.results.InternalResult; import org.zwobble.mammoth.internal.util.Casts; diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java index afb7b74..4ef9c37 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java @@ -1,5 +1,6 @@ package org.zwobble.mammoth.internal.docx; +import org.zwobble.mammoth.internal.archives.Archive; import org.zwobble.mammoth.internal.documents.Comment; import org.zwobble.mammoth.internal.documents.Document; import org.zwobble.mammoth.internal.documents.Notes; diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java b/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java index d268bf0..b01c0f5 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java @@ -1,5 +1,7 @@ package org.zwobble.mammoth.internal.docx; +import org.zwobble.mammoth.internal.archives.Archive; +import org.zwobble.mammoth.internal.archives.MutableArchive; import org.zwobble.mammoth.internal.util.Streams; import java.io.*; diff --git a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java index ab67f07..3bab856 100644 --- a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java @@ -4,7 +4,7 @@ import org.junit.Test; import org.zwobble.mammoth.DocumentConverter; import org.zwobble.mammoth.Result; import org.zwobble.mammoth.internal.docx.EmbeddedStyleMap; -import org.zwobble.mammoth.internal.docx.InMemoryArchive; +import org.zwobble.mammoth.internal.archives.InMemoryArchive; import org.zwobble.mammoth.internal.styles.parsing.ParseException; import java.io.*; diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java index a9c37c6..acbf95f 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java @@ -1,5 +1,6 @@ package org.zwobble.mammoth.tests.docx; +import org.zwobble.mammoth.internal.archives.Archive; import org.zwobble.mammoth.internal.docx.*; import org.zwobble.mammoth.tests.Arguments; diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java index cbb0a5c..05ea9f0 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -5,6 +5,8 @@ import org.hamcrest.Matchers; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.zwobble.mammoth.internal.archives.Archive; +import org.zwobble.mammoth.internal.archives.InMemoryArchive; import org.zwobble.mammoth.internal.documents.*; import org.zwobble.mammoth.internal.docx.*; import org.zwobble.mammoth.internal.results.InternalResult; diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java index 1c1f9a8..76322f9 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java @@ -1,6 +1,9 @@ package org.zwobble.mammoth.tests.docx; import org.junit.Test; +import org.zwobble.mammoth.internal.archives.Archives; +import org.zwobble.mammoth.internal.archives.InMemoryArchive; +import org.zwobble.mammoth.internal.archives.MutableArchive; import org.zwobble.mammoth.internal.docx.*; import org.zwobble.mammoth.internal.util.Streams; |