From 8e76f6ab13a8a4a651f2518b6c91d5e6424c7922 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sat, 27 Apr 2019 18:18:07 +0200 Subject: [PATCH] change package for Streams to nikiroo.utils.streams --- src/be/nikiroo/utils/Cache.java | 2 ++ src/be/nikiroo/utils/IOUtils.java | 2 ++ src/be/nikiroo/utils/{ => streams}/BufferedInputStream.java | 2 +- src/be/nikiroo/utils/{ => streams}/BufferedOutputStream.java | 2 +- .../nikiroo/utils/{ => streams}/MarkableFileInputStream.java | 2 +- src/be/nikiroo/utils/{ => streams}/NextableInputStream.java | 2 +- .../nikiroo/utils/{ => streams}/NextableInputStreamStep.java | 2 +- src/be/nikiroo/utils/{ => streams}/ReplaceInputStream.java | 2 +- src/be/nikiroo/utils/test_code/BufferedInputStreamTest.java | 2 +- src/be/nikiroo/utils/test_code/BufferedOutputStreamTest.java | 2 +- src/be/nikiroo/utils/test_code/NextableInputStreamTest.java | 4 ++-- src/be/nikiroo/utils/test_code/ReplaceInputStreamTest.java | 2 +- 12 files changed, 15 insertions(+), 11 deletions(-) rename src/be/nikiroo/utils/{ => streams}/BufferedInputStream.java (99%) rename src/be/nikiroo/utils/{ => streams}/BufferedOutputStream.java (99%) rename src/be/nikiroo/utils/{ => streams}/MarkableFileInputStream.java (96%) rename src/be/nikiroo/utils/{ => streams}/NextableInputStream.java (99%) rename src/be/nikiroo/utils/{ => streams}/NextableInputStreamStep.java (98%) rename src/be/nikiroo/utils/{ => streams}/ReplaceInputStream.java (98%) diff --git a/src/be/nikiroo/utils/Cache.java b/src/be/nikiroo/utils/Cache.java index ce33592e..cf8a780e 100644 --- a/src/be/nikiroo/utils/Cache.java +++ b/src/be/nikiroo/utils/Cache.java @@ -8,6 +8,8 @@ import java.io.InputStream; import java.net.URL; import java.util.Date; +import be.nikiroo.utils.streams.MarkableFileInputStream; + /** * A generic cache system, with special support for {@link URL}s. *

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java index 9cdaba84..5a7e179b 100644 --- a/src/be/nikiroo/utils/IOUtils.java +++ b/src/be/nikiroo/utils/IOUtils.java @@ -13,6 +13,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; +import be.nikiroo.utils.streams.MarkableFileInputStream; + /** * This class offer some utilities based around Streams and Files. * diff --git a/src/be/nikiroo/utils/BufferedInputStream.java b/src/be/nikiroo/utils/streams/BufferedInputStream.java similarity index 99% rename from src/be/nikiroo/utils/BufferedInputStream.java rename to src/be/nikiroo/utils/streams/BufferedInputStream.java index aa455a24..7c20f634 100644 --- a/src/be/nikiroo/utils/BufferedInputStream.java +++ b/src/be/nikiroo/utils/streams/BufferedInputStream.java @@ -1,4 +1,4 @@ -package be.nikiroo.utils; +package be.nikiroo.utils.streams; import java.io.IOException; import java.io.InputStream; diff --git a/src/be/nikiroo/utils/BufferedOutputStream.java b/src/be/nikiroo/utils/streams/BufferedOutputStream.java similarity index 99% rename from src/be/nikiroo/utils/BufferedOutputStream.java rename to src/be/nikiroo/utils/streams/BufferedOutputStream.java index 4be1d0d3..6f600eba 100644 --- a/src/be/nikiroo/utils/BufferedOutputStream.java +++ b/src/be/nikiroo/utils/streams/BufferedOutputStream.java @@ -1,4 +1,4 @@ -package be.nikiroo.utils; +package be.nikiroo.utils.streams; import java.io.IOException; import java.io.InputStream; diff --git a/src/be/nikiroo/utils/MarkableFileInputStream.java b/src/be/nikiroo/utils/streams/MarkableFileInputStream.java similarity index 96% rename from src/be/nikiroo/utils/MarkableFileInputStream.java rename to src/be/nikiroo/utils/streams/MarkableFileInputStream.java index f4d95d53..dab4cdc4 100644 --- a/src/be/nikiroo/utils/MarkableFileInputStream.java +++ b/src/be/nikiroo/utils/streams/MarkableFileInputStream.java @@ -1,4 +1,4 @@ -package be.nikiroo.utils; +package be.nikiroo.utils.streams; import java.io.FileInputStream; import java.io.FilterInputStream; diff --git a/src/be/nikiroo/utils/NextableInputStream.java b/src/be/nikiroo/utils/streams/NextableInputStream.java similarity index 99% rename from src/be/nikiroo/utils/NextableInputStream.java rename to src/be/nikiroo/utils/streams/NextableInputStream.java index f221cbbd..4a6e0abc 100644 --- a/src/be/nikiroo/utils/NextableInputStream.java +++ b/src/be/nikiroo/utils/streams/NextableInputStream.java @@ -1,4 +1,4 @@ -package be.nikiroo.utils; +package be.nikiroo.utils.streams; import java.io.IOException; import java.io.InputStream; diff --git a/src/be/nikiroo/utils/NextableInputStreamStep.java b/src/be/nikiroo/utils/streams/NextableInputStreamStep.java similarity index 98% rename from src/be/nikiroo/utils/NextableInputStreamStep.java rename to src/be/nikiroo/utils/streams/NextableInputStreamStep.java index a2ee0397..818abf5a 100755 --- a/src/be/nikiroo/utils/NextableInputStreamStep.java +++ b/src/be/nikiroo/utils/streams/NextableInputStreamStep.java @@ -1,4 +1,4 @@ -package be.nikiroo.utils; +package be.nikiroo.utils.streams; import java.io.InputStream; diff --git a/src/be/nikiroo/utils/ReplaceInputStream.java b/src/be/nikiroo/utils/streams/ReplaceInputStream.java similarity index 98% rename from src/be/nikiroo/utils/ReplaceInputStream.java rename to src/be/nikiroo/utils/streams/ReplaceInputStream.java index a456463b..5eac0b44 100644 --- a/src/be/nikiroo/utils/ReplaceInputStream.java +++ b/src/be/nikiroo/utils/streams/ReplaceInputStream.java @@ -1,4 +1,4 @@ -package be.nikiroo.utils; +package be.nikiroo.utils.streams; import java.io.IOException; import java.io.InputStream; diff --git a/src/be/nikiroo/utils/test_code/BufferedInputStreamTest.java b/src/be/nikiroo/utils/test_code/BufferedInputStreamTest.java index c8eb21fd..3ba7be8c 100644 --- a/src/be/nikiroo/utils/test_code/BufferedInputStreamTest.java +++ b/src/be/nikiroo/utils/test_code/BufferedInputStreamTest.java @@ -3,8 +3,8 @@ package be.nikiroo.utils.test_code; import java.io.ByteArrayInputStream; import java.io.InputStream; -import be.nikiroo.utils.BufferedInputStream; import be.nikiroo.utils.IOUtils; +import be.nikiroo.utils.streams.BufferedInputStream; import be.nikiroo.utils.test.TestCase; import be.nikiroo.utils.test.TestLauncher; diff --git a/src/be/nikiroo/utils/test_code/BufferedOutputStreamTest.java b/src/be/nikiroo/utils/test_code/BufferedOutputStreamTest.java index 2ed712e2..8b5d5e9d 100644 --- a/src/be/nikiroo/utils/test_code/BufferedOutputStreamTest.java +++ b/src/be/nikiroo/utils/test_code/BufferedOutputStreamTest.java @@ -2,7 +2,7 @@ package be.nikiroo.utils.test_code; import java.io.ByteArrayOutputStream; -import be.nikiroo.utils.BufferedOutputStream; +import be.nikiroo.utils.streams.BufferedOutputStream; import be.nikiroo.utils.test.TestCase; import be.nikiroo.utils.test.TestLauncher; diff --git a/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java b/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java index 4664cbf7..70123b99 100644 --- a/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java +++ b/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java @@ -4,8 +4,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import be.nikiroo.utils.IOUtils; -import be.nikiroo.utils.NextableInputStream; -import be.nikiroo.utils.NextableInputStreamStep; +import be.nikiroo.utils.streams.NextableInputStream; +import be.nikiroo.utils.streams.NextableInputStreamStep; import be.nikiroo.utils.test.TestCase; import be.nikiroo.utils.test.TestLauncher; diff --git a/src/be/nikiroo/utils/test_code/ReplaceInputStreamTest.java b/src/be/nikiroo/utils/test_code/ReplaceInputStreamTest.java index c0ca9234..e6e21121 100644 --- a/src/be/nikiroo/utils/test_code/ReplaceInputStreamTest.java +++ b/src/be/nikiroo/utils/test_code/ReplaceInputStreamTest.java @@ -4,7 +4,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import be.nikiroo.utils.IOUtils; -import be.nikiroo.utils.ReplaceInputStream; +import be.nikiroo.utils.streams.ReplaceInputStream; import be.nikiroo.utils.test.TestCase; import be.nikiroo.utils.test.TestLauncher; -- 2.27.0