added webm support

[meviz.git] / src / main / java / eu / svjatoslav / meviz / htmlindexer / layouts / MixedLayout.java

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
index ddacb56..fd70b10 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -29,6 +29,8 @@ import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture;
 
 public class MixedLayout implements Layout {
 
+       public static final String encoding = "UTF-8";
+
        Logger logger = Logger.getLogger(MixedLayout.class);
 
        StringBuffer dirHtml = new StringBuffer();
@@ -39,8 +41,6 @@ public class MixedLayout implements Layout {
 
        List<String> path;
 
-       public static final String encoding = "UTF-8";
-
        private AbstractIndexer indexer;
 
        private IndexingContext indexingContext;
@@ -82,7 +82,7 @@ public class MixedLayout implements Layout {
                                        "Error generating thumbnails for image file: "
                                                        + e.toString()
                                                        + ", thumbnail generation skipped, enlisting as ordinary file instead.",
-                                                       e);
+                                       e);
                        enlistFile(picture, parentDirectoryMetadata);
                }
        }
@@ -135,7 +135,7 @@ public class MixedLayout implements Layout {
        @Override
        public void enlistOgv(final AbstractFile abstractFile,
                        final DirectoryMetadata parentDirectoryMetadata)
-                                       throws UnsupportedEncodingException {
+                       throws UnsupportedEncodingException {
 
                final GeneralFile file = (GeneralFile) abstractFile;
 
@@ -143,22 +143,22 @@ public class MixedLayout implements Layout {
 
                // watchable video
                filesHtml
-               .append("<video preload=\"metadata\" controls=\"controls\" tabindex=\"0\">\n");
+                               .append("<video preload=\"metadata\" controls=\"controls\" tabindex=\"0\">\n");
                filesHtml
-               .append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
-                               + indexingContext.getGlobalUrl()
-                               + UrlParamEncoder.encode(indexingContext.getLocalUrl()
-                                               + "/" + file.fileName) + "\">\n");
+                               .append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
+                                               + indexingContext.getGlobalUrl()
+                                               + UrlParamEncoder.encode(indexingContext.getLocalUrl()
+                                                               + "/" + file.fileName) + "\">\n");
                filesHtml.append("</source>\n");
                filesHtml.append("</video>\n");
                filesHtml.append("<br/>\n");
 
                // video title
                filesHtml
-               .append("Video: <b>"
-                               + FilePathParser
-                               .getFileNameWithoutExtension(file.fileName)
-                               + "<b/>  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+                               .append("Video: <b>"
+                                               + FilePathParser
+                                                               .getFileNameWithoutExtension(file.fileName)
+                                               + "<b/>  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
 
                // video download link
                filesHtml.append("<a href=\""