WIP: Update to new API changes

gab1one · gab1one · commit 74f0a3a0bb9b · 2017-10-24T17:22:20.000+02:00
diff --git a/src/main/java/org/scijava/io/handle/DefaultBufferedStreamHandle.java b/src/main/java/org/scijava/io/handle/DefaultBufferedStreamHandle.java
@@ -105,7 +105,7 @@ public void seek(final long pos) throws IOException {
 	}
 
 	private long maxBuf() throws IOException {
-		return getBufferIfOpen().getMaxPos();
+		return getBufferIfOpen().size();
 	}
 
 	@Override
@@ -231,4 +231,9 @@ private ByteBank getBufferIfOpen() throws IOException {
 		}
 		return buffer;
 	}
+
+	@Override
+	public boolean exists() throws IOException {
+		return false;
+	}
 }
diff --git a/src/main/java/org/scijava/io/location/AbstractCompressedHandle.java b/src/main/java/org/scijava/io/location/AbstractCompressedHandle.java
@@ -35,9 +35,10 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.scijava.io.DataHandle;
-import org.scijava.io.DataHandleService;
-import org.scijava.io.Location;
+import org.scijava.io.handle.AbstractStreamHandle;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleService;
+import org.scijava.io.handle.ResettableStreamHandle;
 import org.scijava.plugin.Parameter;
 
 /**
diff --git a/src/main/java/org/scijava/io/location/AbstractHigherOrderLocation.java b/src/main/java/org/scijava/io/location/AbstractHigherOrderLocation.java
@@ -0,0 +1,15 @@
+
+package org.scijava.io.location;
+
+public abstract class AbstractHigherOrderLocation implements Location {
+
+	private final Location baseLocation;
+
+	public AbstractHigherOrderLocation(final Location location) {
+		this.baseLocation = location;
+	}
+
+	public Location getBaseLocation() {
+		return baseLocation;
+	}
+}
diff --git a/src/main/java/org/scijava/io/location/bzip2/BZip2Handle.java b/src/main/java/org/scijava/io/location/bzip2/BZip2Handle.java
@@ -33,7 +33,7 @@
 
 import java.io.IOException;
 
-import org.scijava.io.DataHandle;
+import org.scijava.io.handle.DataHandle;
 import org.scijava.io.location.AbstractCompressedHandle;
 import org.scijava.plugin.Plugin;
 
@@ -61,4 +61,10 @@ public Class<BZip2Location> getType() {
 		return BZip2Location.class;
 	}
 
+	@Override
+	public boolean exists() throws IOException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }
diff --git a/src/main/java/org/scijava/io/location/bzip2/BZip2Location.java b/src/main/java/org/scijava/io/location/bzip2/BZip2Location.java
@@ -1,9 +1,9 @@
 
 package org.scijava.io.location.bzip2;
 
-import org.scijava.io.DataHandle;
-import org.scijava.io.Location;
+import org.scijava.io.handle.DataHandle;
 import org.scijava.io.location.AbstractHigherOrderLocation;
+import org.scijava.io.location.Location;
 
 /**
  * {@link Location} backed by a {@link DataHandle} that is BZip2 compressed.
diff --git a/src/main/java/org/scijava/io/location/bzip2/CBZip2InputStream.java b/src/main/java/org/scijava/io/location/bzip2/CBZip2InputStream.java
@@ -56,8 +56,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.scijava.io.DataHandle;
-import org.scijava.io.Location;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.location.Location;
 import org.scijava.log.LogService;
 
 /**
diff --git a/src/main/java/org/scijava/io/location/gzip/GZipHandle.java b/src/main/java/org/scijava/io/location/gzip/GZipHandle.java
@@ -33,8 +33,8 @@
 import java.io.IOException;
 import java.util.zip.GZIPInputStream;
 
-import org.scijava.io.DataHandle;
-import org.scijava.io.DataHandleInputStream;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleInputStream;
 import org.scijava.io.location.AbstractCompressedHandle;
 import org.scijava.plugin.Plugin;
 
@@ -58,6 +58,12 @@ protected void initInputStream() throws IOException {
 		inputStream = new GZIPInputStream(new DataHandleInputStream<>(raw()));
 	}
 
+	@Override
+	public boolean exists() throws IOException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 //	@Override
 //	public boolean isConstructable(final String file) throws IOException {
 //		final byte[] b = new byte[2];
diff --git a/src/main/java/org/scijava/io/location/gzip/GZipLocation.java b/src/main/java/org/scijava/io/location/gzip/GZipLocation.java
@@ -1,9 +1,9 @@
 
 package org.scijava.io.location.gzip;
 
-import org.scijava.io.DataHandle;
-import org.scijava.io.Location;
+import org.scijava.io.handle.DataHandle;
 import org.scijava.io.location.AbstractHigherOrderLocation;
+import org.scijava.io.location.Location;
 
 /**
  * {@link Location} backed by a {@link DataHandle} that is <code>gzip</code>
diff --git a/src/main/java/org/scijava/io/location/zip/ZipHandle.java b/src/main/java/org/scijava/io/location/zip/ZipHandle.java
@@ -35,12 +35,12 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.scijava.io.DataHandle;
-import org.scijava.io.DataHandleInputStream;
-import org.scijava.io.Location;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleInputStream;
+import org.scijava.io.handle.ResettableStreamHandle;
+import org.scijava.io.handle.StreamHandle;
 import org.scijava.io.location.AbstractCompressedHandle;
-import org.scijava.io.location.ResettableStreamHandle;
-import org.scijava.io.location.StreamHandle;
+import org.scijava.io.location.Location;
 import org.scijava.plugin.Plugin;
 
 /**
@@ -202,4 +202,10 @@ protected void initInputStream() throws IOException {
 			resetStream();
 		}
 	}
+
+	@Override
+	public boolean exists() throws IOException {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/src/main/java/org/scijava/io/location/zip/ZipLocation.java b/src/main/java/org/scijava/io/location/zip/ZipLocation.java
@@ -33,9 +33,9 @@
 
 import java.util.zip.ZipEntry;
 
-import org.scijava.io.DataHandle;
-import org.scijava.io.Location;
+import org.scijava.io.handle.DataHandle;
 import org.scijava.io.location.AbstractHigherOrderLocation;
+import org.scijava.io.location.Location;
 import org.scijava.plugin.Plugin;
 
 /**
diff --git a/src/test/java/org/scijava/io/BZip2HandleTest.java b/src/test/java/org/scijava/io/BZip2HandleTest.java
@@ -35,9 +35,12 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleTest;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.io.location.bzip2.BZip2Handle;
 import org.scijava.io.location.bzip2.BZip2Location;
-import org.scijava.io.location.file.FileLocation;
 
 /**
  * Tests {@link BZip2Handle}.
diff --git a/src/test/java/org/scijava/io/BZip2LocationTest.java b/src/test/java/org/scijava/io/BZip2LocationTest.java
@@ -36,8 +36,9 @@
 import java.io.IOException;
 
 import org.junit.Test;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.io.location.bzip2.BZip2Location;
-import org.scijava.io.location.file.FileLocation;
 
 /**
  * Tests {@link BZip2Location}.
diff --git a/src/test/java/org/scijava/io/GZipHandleTest.java b/src/test/java/org/scijava/io/GZipHandleTest.java
@@ -36,7 +36,10 @@
 import java.io.IOException;
 import java.util.zip.GZIPOutputStream;
 
-import org.scijava.io.location.file.FileLocation;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleTest;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.io.location.gzip.GZipHandle;
 import org.scijava.io.location.gzip.GZipLocation;
 
diff --git a/src/test/java/org/scijava/io/GZipLocationTest.java b/src/test/java/org/scijava/io/GZipLocationTest.java
@@ -36,7 +36,8 @@
 import java.io.IOException;
 
 import org.junit.Test;
-import org.scijava.io.location.file.FileLocation;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.io.location.gzip.GZipLocation;
 
 /**
diff --git a/src/test/java/org/scijava/io/ZipHandleTest.java b/src/test/java/org/scijava/io/ZipHandleTest.java
@@ -37,7 +37,10 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.scijava.io.location.file.FileLocation;
+import org.scijava.io.handle.DataHandle;
+import org.scijava.io.handle.DataHandleTest;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.io.location.zip.ZipHandle;
 import org.scijava.io.location.zip.ZipLocation;
 
diff --git a/src/test/java/org/scijava/io/ZipLocationTest.java b/src/test/java/org/scijava/io/ZipLocationTest.java
@@ -36,7 +36,8 @@
 import java.io.IOException;
 
 import org.junit.Test;
-import org.scijava.io.location.file.FileLocation;
+import org.scijava.io.location.FileLocation;
+import org.scijava.io.location.Location;
 import org.scijava.io.location.zip.ZipLocation;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public void seek(final long pos) throws IOException {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`private long maxBuf() throws IOException {`
`108`		`- return getBufferIfOpen().getMaxPos();`
	`108`	`+ return getBufferIfOpen().size();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@Override`
`@@ -231,4 +231,9 @@ private ByteBank getBufferIfOpen() throws IOException {`
`231`	`231`	`}`
`232`	`232`	`return buffer;`
`233`	`233`	`}`
	`234`	`+`
	`235`	`+ @Override`
	`236`	`+ public boolean exists() throws IOException {`
	`237`	`+ return false;`
	`238`	`+ }`
`234`	`239`	`}`