Mercurial > hg > digilib-old

diff servlet/src/digilib/io/ImageFileset.java @ 563:686086d6e6d6 digilibPDF

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more refactoring and rearranging more enums pdf and image generation still works
author robcast
date Fri, 17 Dec 2010 20:42:25 +0100
parents e758a49258e8
children
line wrap: on
line diff
--- a/servlet/src/digilib/io/ImageFileset.java	Fri Dec 17 16:24:03 2010 +0100
+++ b/servlet/src/digilib/io/ImageFileset.java	Fri Dec 17 20:42:25 2010 +0100
@@ -26,8 +26,9 @@
 import java.util.ListIterator;
 import java.util.Map;
 
-import digilib.image.ImageOps;
 import digilib.image.ImageSize;
+import digilib.io.FileOps.FileClass;
+import digilib.servlet.DigilibConfiguration;
 
 /**
  * @author casties
@@ -35,7 +36,7 @@
 public class ImageFileset extends DocuDirent {
 
 	/** this is an image file */
-	protected static int fileClass = FileOps.CLASS_IMAGE;
+	protected static FileClass fileClass = FileClass.IMAGE;
 	
 	/** list of files (ImageFile) */
 	private List<ImageFile> list = null;
@@ -137,7 +138,7 @@
 			ImageFile f = i.next();
 			try {
 				if (!f.isChecked()) {
-					ImageOps.checkFile(f);
+					DigilibConfiguration.docuImageIdentify(f);
 				}
 				if (f.getSize().isTotallySmallerThan(size)) {
 					return f;
@@ -165,7 +166,7 @@
 			ImageFile f = i.previous();
 			try {
 				if (!f.isChecked()) {
-					ImageOps.checkFile(f);
+					DigilibConfiguration.docuImageIdentify(f);
 				}
 				if (f.getSize().isBiggerThan(size)) {
 					return f;
@@ -272,7 +273,7 @@
 					continue;
 				}
 			}
-			if (FileOps.classForFilename(dirFiles[fileIdx]) == FileOps.CLASS_IMAGE) {
+			if (FileOps.classForFilename(dirFiles[fileIdx]) == fileClass) {
 				/* logger.debug("adding file " + dirFiles[fileIdx]
 						+ " to Fileset " + this.getName()); */
 				add(new ImageFile(dirFiles[fileIdx], this, dirs[dirIdx]));