X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FAbstractIndexer.java;h=fff1b6877d4495ad73ddda302a6b79d6b67d13f3;hb=bc2cdc4cc3316a5fb66f4372e3708b610c8f68b0;hp=762fcad8ca0ab5810bcf9b3096ec0b246892e1a0;hpb=f826af1cdb62425a975cd174ecd0905100d3a2dc;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java
index 762fcad..fff1b68 100644
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/AbstractIndexer.java
@@ -12,6 +12,28 @@ import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture;
 
 public abstract class AbstractIndexer {
 
+	public static boolean isImage(final String fileExtension) {
+		for (final String ext : Constants.SUPPORTED_IMAGE_EXTENSIONS)
+			if (ext.equals(fileExtension))
+				return true;
+		return false;
+	}
+
+	public static boolean isOgv(final String fileExtension) {
+		return fileExtension.equalsIgnoreCase("ogv");
+	}
+
+	public static boolean shallFileBeIndexed(final File file) {
+
+		if (file.getName().startsWith("."))
+			return false;
+		if (file.getName().startsWith("index"))
+			if (file.getName().endsWith(".html"))
+				return false;
+
+		return true;
+	}
+
 	public void compileHtml(final Layout layout,
 			final DirectoryMetadata directory)
 			throws UnsupportedEncodingException {
@@ -21,14 +43,14 @@ public abstract class AbstractIndexer {
 				final String fileExtension = file.getFileExtension();
 
 				if ("ogv".equals(fileExtension))
-					layout.enlistOgv(file);
+					layout.enlistOgv(file, directory);
 				else
-					layout.enlistFile(file);
+					layout.enlistFile(file, directory);
 
 			} else if (file instanceof Picture)
-				layout.enlistImage(file);
+				layout.enlistImage((Picture) file, directory);
 			else if (file instanceof DirectoryFile)
-				layout.enlistDirectory(file);
+				layout.enlistDirectory(file, directory);
 
 	}
 
@@ -40,26 +62,4 @@ public abstract class AbstractIndexer {
 	public abstract String getThumbnailUrl(Picture picture,
 			final Dimension desiredDimension, IndexingContext context);
 
-	public static boolean isImage(final String fileExtension) {
-		for (final String ext : Constants.SUPPORTED_IMAGE_EXTENSIONS)
-			if (ext.equals(fileExtension))
-				return true;
-		return false;
-	}
-
-	public static boolean isOgv(final String fileExtension) {
-		return fileExtension.equalsIgnoreCase("ogv");
-	}
-
-	public static boolean shallFileBeIndexed(final File file) {
-
-		if (file.getName().startsWith("."))
-			return false;
-		if (file.getName().startsWith("index"))
-			if (file.getName().endsWith(".html"))
-				return false;
-
-		return true;
-	}
-
 }