Cleanup and lombok

Author: optyfr

JRomManager/src/jrm/compressors/NArchive.java

@@ -17,6 +17,7 @@
 package jrm.compressors;
 
 import jrm.locale.Messages;
+import lombok.Getter;
 
 /**
  * Zip supported levels of compression
@@ -32,22 +33,12 @@ public enum ZipOptions
 	MAXIMUM(Messages.getString("ZipOptions.MAXIMUM"), 7), //$NON-NLS-1$
 	ULTRA(Messages.getString("ZipOptions.ULTRA"), 9); //$NON-NLS-1$
 
-	private String desc;
-	private int level;
+	private @Getter String desc;
+	private @Getter int level;
 
 	private ZipOptions(final String desc, final int level)
 	{
 		this.desc = desc;
 		this.level = level;
 	}
-
-	public String getName()
-	{
-		return desc;
-	}
-
-	public int getLevel()
-	{
-		return level;
-	}
 }

JRomManager/src/jrm/compressors/ZipOptions.java

@@ -0,0 +1,59 @@
+package jrm.compressors.sevenzipjbinding;
+
+import java.io.FileNotFoundException;
+import java.io.RandomAccessFile;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.sf.sevenzipjbinding.IArchiveOpenVolumeCallback;
+import net.sf.sevenzipjbinding.IInStream;
+import net.sf.sevenzipjbinding.PropID;
+import net.sf.sevenzipjbinding.SevenZipException;
+import net.sf.sevenzipjbinding.impl.RandomAccessFileInStream;
+
+public class Archive7ZOpenVolumeCallback implements IArchiveOpenVolumeCallback
+{
+	/**
+	 * 
+	 */
+	private final Closeables closeables;
+
+	/**
+	 * @param nArchive
+	 */
+	public Archive7ZOpenVolumeCallback(Closeables closeables)
+	{
+		this.closeables = closeables;
+	}
+
+	private Map<String, RandomAccessFile> openedRandomAccessFileList = new HashMap<String, RandomAccessFile>();
+
+	public Object getProperty(PropID propID) throws SevenZipException
+	{
+		return null;
+	}
+
+	public IInStream getStream(String filename) throws SevenZipException
+	{
+		try
+		{
+			RandomAccessFile randomAccessFile = openedRandomAccessFileList.get(filename);
+			if (randomAccessFile != null)
+				randomAccessFile.seek(0);
+			else
+			{
+				closeables.addCloseables(randomAccessFile = new RandomAccessFile(filename, "r"));
+				openedRandomAccessFileList.put(filename, randomAccessFile);					
+			}
+			return new RandomAccessFileInStream(randomAccessFile);
+		}
+		catch (FileNotFoundException fileNotFoundException)
+		{
+			return null; // We return always null in this case
+		}
+		catch (Exception e)
+		{
+			throw new RuntimeException(e);
+		}
+	}
+}

JRomManager/src/jrm/compressors/sevenzipjbinding/Archive7ZOpenVolumeCallback.java

@@ -0,0 +1,76 @@
+package jrm.compressors.sevenzipjbinding;
+
+import java.io.FileNotFoundException;
+import java.io.RandomAccessFile;
+import java.util.HashMap;
+import java.util.Map;
+
+import net.sf.sevenzipjbinding.IArchiveOpenCallback;
+import net.sf.sevenzipjbinding.IArchiveOpenVolumeCallback;
+import net.sf.sevenzipjbinding.IInStream;
+import net.sf.sevenzipjbinding.PropID;
+import net.sf.sevenzipjbinding.SevenZipException;
+import net.sf.sevenzipjbinding.impl.RandomAccessFileInStream;
+
+public class ArchiveRAROpenVolumeCallback implements IArchiveOpenVolumeCallback, IArchiveOpenCallback
+{
+	/**
+	 * 
+	 */
+	private final Closeables closeables;
+
+	/**
+	 * @param nArchive
+	 */
+	public ArchiveRAROpenVolumeCallback(Closeables closeables)
+	{
+		this.closeables = closeables;
+	}
+
+	private Map<String, RandomAccessFile> openedRandomAccessFileList = new HashMap<String, RandomAccessFile>();
+	private String name;
+
+	public Object getProperty(PropID propID) throws SevenZipException
+	{
+		switch (propID)
+		{
+			case NAME:
+				return name;
+			default:
+				return null;
+		}
+	}
+
+	public IInStream getStream(String filename) throws SevenZipException
+	{
+		try
+		{
+			RandomAccessFile randomAccessFile = openedRandomAccessFileList.get(filename);
+			if (randomAccessFile != null)
+				randomAccessFile.seek(0);
+			else
+			{
+				closeables.addCloseables(randomAccessFile = new RandomAccessFile(filename, "r"));
+				openedRandomAccessFileList.put(filename, randomAccessFile);
+			}
+			name = filename;
+			return new RandomAccessFileInStream(randomAccessFile);
+		}
+		catch (FileNotFoundException fileNotFoundException)
+		{
+			return null; // We return always null in this case
+		}
+		catch (Exception e)
+		{
+			throw new RuntimeException(e);
+		}
+	}
+
+	public void setCompleted(Long files, Long bytes) throws SevenZipException
+	{
+	}
+
+	public void setTotal(Long files, Long bytes) throws SevenZipException
+	{
+	}
+}