X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FFilesystemIndexer.java;fp=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FFilesystemIndexer.java;h=61b9027b28cee8868d61548bbebe548f821f58f3;hb=99bc9002a93c8ab224934032a1a5fe0c00d5de96;hp=58244f094920e74eaeb5f2011d2bb10f9a2802cd;hpb=e4c678d8e9b77ef2e9c8819bbc8b0240463d6770;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
index 58244f0..61b9027 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -54,8 +54,7 @@ public class FilesystemIndexer extends AbstractIndexer {
 
 	public FilesystemIndexer(final File directoryToIndex,
 			final CommandlineHandler commandlineHandler,
-			final List<String> pathElements) throws IOException,
-			ImageFormatError {
+			final List<String> pathElements) throws Exception {
 
 		this.directoryToIndex = directoryToIndex;
 		this.commandlineHandler = commandlineHandler;
@@ -148,7 +147,7 @@ public class FilesystemIndexer extends AbstractIndexer {
 		validMetadataFiles.add(thumbnailFileName);
 		final File thumbnailFile = new File(
 				Utils.getThumbnailsDirectoryPath(directoryToIndex)
-						+ thumbnailFileName);
+				+ thumbnailFileName);
 
 		if (!thumbnailFile.exists()) {
 
@@ -160,7 +159,7 @@ public class FilesystemIndexer extends AbstractIndexer {
 					desiredDimension.getAwtDimension());
 		}
 		return Constants.THUMBNAILS_DIRECTORY_NAME + "/"
-				+ UrlParamEncoder.encode(thumbnailFileName);
+		+ UrlParamEncoder.encode(thumbnailFileName);
 	}
 
 	public void indexForLayout(final Layout layout)
@@ -175,7 +174,7 @@ public class FilesystemIndexer extends AbstractIndexer {
 					layout.enlistFile(abstractFile);
 
 			} else if (abstractFile instanceof Picture)
-				layout.enlistImage(abstractFile);
+				layout.enlistImage((Picture) abstractFile);
 			else if (abstractFile instanceof DirectoryFile)
 				layout.enlistDirectory(abstractFile);
 
@@ -204,7 +203,7 @@ public class FilesystemIndexer extends AbstractIndexer {
 
 		metadataFile = new File(
 				Utils.getThumbnailsDirectoryPath(directoryToIndex)
-						+ Constants.METADATA_FILE_NAME);
+				+ Constants.METADATA_FILE_NAME);
 
 		metadata = MetadadaHelper.initDirectoryMetadata(metadataFile);
 	}
@@ -218,11 +217,9 @@ public class FilesystemIndexer extends AbstractIndexer {
 
 	}
 
-	public void updateMetadata() throws IOException, ImageFormatError {
+	public void updateMetadata() throws Exception {
 
-		final File[] directoryContent = directoryToIndex.listFiles();
-
-		for (final File file : directoryContent)
+		for (final File file : directoryToIndex.listFiles())
 			if (shallFileBeIndexed(file)) {
 
 				metadata.ensureFileMetainfoIsUpToDate(directoryToIndex, file);