refactor: move Volume classes to volume package

BREAKING CHANGE: public API changed
junrar · Jul 25, 2020 · c2405e0 · c2405e0
1 parent 70499bb
commit c2405e0
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 15 deletions.
diff --git a/src/main/java/com/github/junrar/Archive.java b/src/main/java/com/github/junrar/Archive.java
@@ -48,6 +48,8 @@
 import com.github.junrar.unpack.Unpack;
 import com.github.junrar.volume.FileVolumeManager;
 import com.github.junrar.volume.InputStreamVolumeManager;
+import com.github.junrar.volume.Volume;
+import com.github.junrar.volume.VolumeManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/com/github/junrar/UnrarCallback.java b/src/main/java/com/github/junrar/UnrarCallback.java
@@ -1,8 +1,9 @@
 package com.github.junrar;
 
 
+import com.github.junrar.volume.Volume;
+
 /**
- *
  * @author alban
  */
 public interface UnrarCallback {

diff --git a/src/main/java/com/github/junrar/unpack/ComprDataIO.java b/src/main/java/com/github/junrar/unpack/ComprDataIO.java
@@ -19,22 +19,21 @@
 
 import com.github.junrar.Archive;
 import com.github.junrar.UnrarCallback;
-import com.github.junrar.Volume;
 import com.github.junrar.crc.RarCRC;
 import com.github.junrar.crypt.Rijndael;
 import com.github.junrar.exception.CrcErrorException;
 import com.github.junrar.exception.InitDeciphererFailedException;
 import com.github.junrar.exception.RarException;
 import com.github.junrar.rarfile.FileHeader;
+import com.github.junrar.volume.Volume;
 
+import javax.crypto.Cipher;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import javax.crypto.Cipher;
-
 /**
  * DOCUMENT ME
  *

diff --git a/src/main/java/com/github/junrar/volume/FileVolume.java b/src/main/java/com/github/junrar/volume/FileVolume.java
@@ -1,7 +1,6 @@
 package com.github.junrar.volume;
 
 import com.github.junrar.Archive;
-import com.github.junrar.Volume;
 import com.github.junrar.io.SeekableReadOnlyByteChannel;
 import com.github.junrar.io.SeekableReadOnlyFile;
 

diff --git a/src/main/java/com/github/junrar/volume/FileVolumeManager.java b/src/main/java/com/github/junrar/volume/FileVolumeManager.java
@@ -1,9 +1,6 @@
 package com.github.junrar.volume;
 
 import com.github.junrar.Archive;
-import com.github.junrar.Volume;
-import com.github.junrar.VolumeManager;
-import com.github.junrar.util.VolumeHelper;
 
 import java.io.File;
 

diff --git a/src/main/java/com/github/junrar/volume/InputStreamVolume.java b/src/main/java/com/github/junrar/volume/InputStreamVolume.java
@@ -1,7 +1,6 @@
 package com.github.junrar.volume;
 
 import com.github.junrar.Archive;
-import com.github.junrar.Volume;
 import com.github.junrar.io.SeekableReadOnlyByteChannel;
 import com.github.junrar.io.SeekableReadOnlyInputStream;
 

diff --git a/src/main/java/com/github/junrar/volume/InputStreamVolumeManager.java b/src/main/java/com/github/junrar/volume/InputStreamVolumeManager.java
@@ -1,8 +1,6 @@
 package com.github.junrar.volume;
 
 import com.github.junrar.Archive;
-import com.github.junrar.Volume;
-import com.github.junrar.VolumeManager;
 
 import java.io.InputStream;
 

diff --git a/src/main/java/com/github/junrar/Volume.java → ...java/com/github/junrar/volume/Volume.java b/src/main/java/com/github/junrar/Volume.java → ...java/com/github/junrar/volume/Volume.java
@@ -1,5 +1,6 @@
-package com.github.junrar;
+package com.github.junrar.volume;
 
+import com.github.junrar.Archive;
 import com.github.junrar.io.SeekableReadOnlyByteChannel;
 
 import java.io.IOException;

diff --git a/.../com/github/junrar/util/VolumeHelper.java → ...om/github/junrar/volume/VolumeHelper.java b/.../com/github/junrar/util/VolumeHelper.java → ...om/github/junrar/volume/VolumeHelper.java
@@ -1,4 +1,4 @@
-package com.github.junrar.util;
+package com.github.junrar.volume;
 
 /**
  *

diff --git a/...java/com/github/junrar/VolumeManager.java → ...m/github/junrar/volume/VolumeManager.java b/...java/com/github/junrar/VolumeManager.java → ...m/github/junrar/volume/VolumeManager.java
@@ -1,10 +1,11 @@
-package com.github.junrar;
+package com.github.junrar.volume;
+
+import com.github.junrar.Archive;
 
 import java.io.IOException;
 
 /**
  * @author <a href="http://www.rogiel.com">Rogiel</a>
- *
  */
 public interface VolumeManager {
     Volume nextArchive(Archive archive, Volume lastVolume) throws IOException;