change package for Streams to nikiroo.utils.streams

diff --git a/src/be/nikiroo/utils/Cache.java b/src/be/nikiroo/utils/Cache.java
index ce33592ed3a4419cee1a6553908cae8621bfefd8..cf8a780ef9ae49f99b5536a5d549e5522a01837b 100644 (file)
--- 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.
  * <p>

diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java
index 9cdaba840af79727fba495b2095af03cf5918c2f..5a7e179b684d9423182c048376f2bf014c54077b 100644 (file)
--- 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 aa455a2426d0b96d2534f27c0740c545510c858f..7c20f634824841c8c7dd5d60fe94456dce1c78da 100644 (file)
--- 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 4be1d0d32f8f3965f512fef543e46a6e24b9afee..6f600eba7c06384db6f254ed8a89642257641156 100644 (file)
--- 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 f4d95d53bf73d6326e2fbabcf7a0a656f40c75fa..dab4cdc45a536f993f8e6924d89ef4fdd5780e32 100644 (file)
--- 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 f221cbbda9aa2ce9ad0eff7f215c725cbc886ab0..4a6e0abc672abf441ef6acf51f9db9ed1d625585 100644 (file)
--- 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 a2ee039717fa033bfd6c938bcafc211587903313..818abf5af730e8210d5151a12df0970758f694d3 100755 (executable)
--- 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 a456463b79032585a1c6372656265c4f089495c6..5eac0b448fef0262b9f2ded53a4c199a2c41d0b7 100644 (file)
--- 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 c8eb21fdf4b0d446d7a57d8edbee7f01484d64e1..3ba7be8c738d2308215f33b59dbeff02a69a4606 100644 (file)
--- 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 2ed712e24da8f2ff3b391734deda05295870c1e4..8b5d5e9d28042a4ee2af4568623ef75e0c275ae6 100644 (file)
--- 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 4664cbf7e161b41e1b85179debbbe95fc2991b42..70123b99ee7095be9764b0605c844284665031e2 100644 (file)
--- 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 c0ca923421e561a2cdda3443ac13dded9495a56a..e6e211215430485cfd0938b5fcb89f6fc5ee4a5e 100644 (file)
--- 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;