diff servlet/src/digilib/image/ImageJobDescription.java @ 576:dad720e9b12b stream

try: DocuDirent as interface, ImageFile inherits from ImageInput and implements DocuDirent
author robcast
date Wed, 22 Dec 2010 20:19:06 +0100
parents 790cbfb58b52
children 95417c4615b8
line wrap: on
line diff
--- a/servlet/src/digilib/image/ImageJobDescription.java	Wed Dec 22 18:32:06 2010 +0100
+++ b/servlet/src/digilib/image/ImageJobDescription.java	Wed Dec 22 20:19:06 2010 +0100
@@ -12,6 +12,7 @@
 import digilib.io.FileOps;
 import digilib.io.FileOps.FileClass;
 import digilib.io.ImageFile;
+import digilib.io.ImageInput;
 import digilib.io.ImageSet;
 import digilib.servlet.DigilibConfiguration;
 import digilib.util.OptionsSet;
@@ -36,7 +37,7 @@
 	DigilibConfiguration dlConfig = null;
 	protected static Logger logger = Logger.getLogger("digilib.servlet");
 
-	ImageFile fileToLoad = null;
+	ImageInput fileToLoad = null;
 	ImageSet fileset = null;
 	DocuDirectory fileDir = null;
 	String filePath = null;
@@ -132,14 +133,14 @@
 		if (mimeType == null) {
 			fileToLoad = getFileToLoad();
 			if(! fileToLoad.isChecked()){
-				DigilibConfiguration.docuImageIdentify(fileToLoad);
+				DigilibConfiguration.docuImageIdentify((ImageFile) fileToLoad); //FIXME: cast to file?
 			}
 			mimeType = fileToLoad.getMimetype();
 		}
 		return mimeType;
 	}
 	
-	public ImageFile getFileToLoad() throws IOException {
+	public ImageInput getFileToLoad() throws IOException {
 		
 		if(fileToLoad == null){
 			fileset = getFileset();
@@ -163,7 +164,7 @@
 					fileToLoad = fileset.getBiggest();
 				}
 			}
-			logger.info("Planning to load: " + fileToLoad.getFile());
+			logger.info("Planning to load: " + fileToLoad);
 		}
 		
 		return fileToLoad;
@@ -247,9 +248,9 @@
 		ImageSize hiresSize = null;
 		ImageSet fileset = getFileset();
 		if (getAbsoluteScale()) {
-			ImageFile hiresFile = fileset.getBiggest();
+			ImageInput hiresFile = fileset.getBiggest();
 			if (!hiresFile.isChecked()) {
-				DigilibConfiguration.docuImageIdentify(hiresFile);
+				DigilibConfiguration.docuImageIdentify((ImageFile) hiresFile); //FIXME: cast to file?
 			}
 			hiresSize = hiresFile.getSize();
 		}