diff servlet/src/digilib/io/ImageFile.java @ 574:790cbfb58b52 stream

ripping apart ImageFileSet
author robcast
date Wed, 22 Dec 2010 18:32:06 +0100
parents 34701340922e
children dad720e9b12b efd7a223f819
line wrap: on
line diff
--- a/servlet/src/digilib/io/ImageFile.java	Wed Dec 22 09:54:34 2010 +0100
+++ b/servlet/src/digilib/io/ImageFile.java	Wed Dec 22 18:32:06 2010 +0100
@@ -22,7 +22,6 @@
 package digilib.io;
 
 import java.io.File;
-import java.io.InputStream;
 
 import digilib.image.ImageSize;
 
@@ -33,12 +32,12 @@
 	
 	// file name
 	private String filename = null;
-	// parent ImageFileset
-	private ImageFileset parent = null;
+	// parent ImageSet
+	private ImageSet parent = null;
 	// parent directory
 	private Directory dir = null;
 
-	public ImageFile(String fn, ImageFileset parent, Directory dir) {
+	public ImageFile(String fn, ImageSet parent, Directory dir) {
 		this.filename = fn;
 		this.parent = parent;
 		this.dir = dir;
@@ -79,9 +78,9 @@
 	}
 
 	/**
-	 * @return ImageFileset
+	 * @return ImageSet
 	 */
-	public ImageFileset getParent() {
+	public ImageSet getParent() {
 		return parent;
 	}
 
@@ -89,7 +88,7 @@
 	 * Sets the parent.
 	 * @param parent The parent to set
 	 */
-	public void setParent(ImageFileset parent) {
+	public void setParent(ImageSet parent) {
 		this.parent = parent;
 	}