projects / meviz.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
better error handling
[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 9585215..f7eee2c 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -39,66 +39,45 @@ public class MixedLayout implements Layout {
 
        public static final String encoding = "UTF-8";
 
-       int currentColumn = 0;
-
-       int horizontalColumnsLimit = 2;
-
        private AbstractIndexer indexer;
 
        private IndexingContext indexingContext;
 
-       public void columnAdded() {
-               currentColumn++;
-               if (currentColumn > horizontalColumnsLimit) {
-
-                       currentColumn = 0;
-
-                       filesHtml.append("</TR>\n");
-               }
-       }
-
        @Override
        public void enlistDirectory(final AbstractFile directory) {
                dirHtml.append("<TR>");
                dirHtml.append("<TD><b><a href=\""
                                + indexer.getDirectoryUrl(directory, indexingContext)
-                               + "\"> ==&gt; " + directory.fileName + "</a></b></TD>");
+                               + "\"><h2> ==&gt; " + directory.fileName + "</h2></a></b></TD>");
                dirHtml.append("</TR>\n");
 
        }
 
        @Override
        public void enlistFile(final AbstractFile file) {
-               finishRow();
 
                final String fullFileName = file.fileName;
 
-               filesHtml.append("<TR>\n");
-               filesHtml.append("    <TD colspan=\""
-                               + String.valueOf(horizontalColumnsLimit)
-                               + "\"><a href=\""
+               filesHtml.append("<div style=\"clear: both;\"><a href=\""
                                + indexingContext.getGlobalUrl()
                                + UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
                                                + fullFileName) + "\">" + fullFileName + "</a>\n");
                filesHtml.append("&nbsp;&nbsp;("
                                + FilePathParser.getFileSizeDescription(file.getFileLength())
-                               + ")</TD>\n");
-               filesHtml.append("</TR>\n");
+                               + ")</div><br/>\n");
 
        }
 
        @Override
-       public void enlistImage(final AbstractFile abstractFile) {
+       public void enlistImage(final Picture picture) {
                try {
 
-                       final Picture picture = (Picture) abstractFile;
-
                        final Dimension imageSize = picture.getDimensions();
 
                        final List<Dimension> recommendedDimensions = Picture
                                        .getThumbnailDimensions(imageSize);
 
-                       Dimension listingDimension = new Dimension(500, 500);
+                       Dimension listingDimension = new Dimension(1500, 450);
 
                        if (listingDimension.width > imageSize.width)
                                if (listingDimension.height > imageSize.height)
@@ -107,9 +86,8 @@ public class MixedLayout implements Layout {
                        final String listingThumbnailUrl = indexer.getThumbnailUrl(picture,
                                        listingDimension, indexingContext);
 
-                       startcolumn();
-
-                       filesHtml.append("<TD><center><a href=\""
+                       filesHtml.append("<div style=\"float:left; margin: 10px;\">");
+                       filesHtml.append("<a href=\""
                                        + indexingContext.getGlobalUrl()
                                        + UrlParamEncoder.encode(indexingContext.getLocalUrl()
                                                        + "/" + picture.fileName) + "\">\n");
@@ -118,7 +96,7 @@ public class MixedLayout implements Layout {
                                        + "\"/></a>\n");
                        filesHtml.append("<br/><b>"
                                        + FilePathParser
-                                       .getFileNameWithoutExtension(picture.fileName)
+                                                       .getFileNameWithoutExtension(picture.fileName)
                                        + "</b><br/>(");
 
                        int count = 0;
@@ -133,17 +111,16 @@ public class MixedLayout implements Layout {
                                filesHtml.append("</a>");
                        }
 
-                       filesHtml.append(")</TD>\n");
-
-                       columnAdded();
+                       filesHtml.append(")\n");
+                       filesHtml.append("</div>");
 
                } catch (final Exception e) {
                        logger.error(
                                        "Error generating thumbnails for image file: "
                                                        + e.toString()
                                                        + ", thumbnail generation skipped, enlisting as ordinary file instead.",
-                                                       e);
-                       enlistFile(abstractFile);
+                                       e);
+                       enlistFile(picture);
                }
        }
 
@@ -154,19 +131,14 @@ public class MixedLayout implements Layout {
 
                final GeneralFile file = (GeneralFile) abstractFile;
 
-               finishRow();
-
                filesHtml
-               .append("<TR style=\"background-color: #404040; text-align: center\">\n");
-               filesHtml.append("<TD style=\"text-align: center\" colspan=\""
-                               + String.valueOf(horizontalColumnsLimit) + "\">\n");
-
-               filesHtml.append("<video controls=\"controls\" tabindex=\"0\">\n");
+                               .append("<div style=\"margin: 30px; clear: both;\">"
+                                               + "<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");
@@ -174,32 +146,19 @@ public class MixedLayout implements Layout {
                filesHtml.append("<br/>\n");
 
                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;");
                filesHtml.append("<a href=\""
                                + indexingContext.getGlobalUrl()
                                + UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
-                                               + file.fileName) + "\">download as OGV</a>\n");
+                                               + file.fileName) + "\">download as OGV</a></div>\n");
 
-               filesHtml.append("</TD></TR>\n");
+               filesHtml.append("\n");
 
        }
 
-       public void finishRow() {
-
-               if (currentColumn == 0)
-                       return;
-
-               while (currentColumn <= horizontalColumnsLimit) {
-                       filesHtml.append("<TD></TD>");
-                       currentColumn++;
-               }
-               filesHtml.append("</TR>\n");
-               currentColumn = 0;
-       }
-
        /** {@inheritDoc} */
        @Override
        public String getFileNameSuffix() {
@@ -219,10 +178,10 @@ public class MixedLayout implements Layout {
                        finalHtml.append("<HTML>\n");
                        finalHtml.append("<HEAD>\n");
                        finalHtml
-                       .append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
+                                       .append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
                        finalHtml.append("</HEAD>\n");
                        finalHtml
-                       .append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
+                                       .append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
                        finalHtml.append("<!-- " + Constants.HTML_MAGIC_STRING + " -->\n");
                        finalHtml.append("<!-- " + Constants.HTML_MEMO + " -->\n");
                        finalHtml.append("<font color=\"#ffffff\">\n");
@@ -230,34 +189,13 @@ public class MixedLayout implements Layout {
 
                if (showTitle)
                        finalHtml
-                       .append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
-
-               finalHtml.append("<CENTER><H2>");
-               for (final String p : path)
-                       finalHtml.append(" / " + p);
-               finalHtml.append("</H2></CENTER>\n");
-
-               // append directory listing
-               finalHtml.append("<TABLE>\n");
-
-               if (path.size() > 0) {
-                       finalHtml.append("<TR>");
-                       finalHtml.append("<TD><b><a href=\""
-                                       + indexer.getParentDirectoryUrl(indexingContext)
-                                       + "\"> &lt;== ..</a></b></TD>");
-                       finalHtml.append("</TR>\n");
-               }
+                                       .append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
 
-               finalHtml.append(dirHtml.toString());
-               finalHtml.append("\n<TR><TD><br></TD></TR>\n");
-               finalHtml.append("</TABLE>\n");
+               showCurrentPath(finalHtml);
 
-               // append file listing
+               listDirectories(finalHtml);
 
-               finishRow();
-               finalHtml.append("<TABLE width=\"1100\">\n");
                finalHtml.append(filesHtml.toString());
-               finalHtml.append("\n</TABLE>\n");
 
                if (doHtmlHeaderAndFooter)
                        finalHtml.append("</font></BODY></HTML>\n");
@@ -278,11 +216,27 @@ public class MixedLayout implements Layout {
                filesHtml = new StringBuffer();
        }
 
-       public void startcolumn() {
-               if (currentColumn == 0) {
-                       filesHtml.append("<TR>");
-                       currentColumn = 1;
+       private void listDirectories(final StringBuffer finalHtml) {
+               finalHtml.append("<TABLE>\n");
+
+               if (path.size() > 0) {
+                       finalHtml.append("<TR>");
+                       finalHtml.append("<TD><b><a href=\""
+                                       + indexer.getParentDirectoryUrl(indexingContext)
+                                       + "\"><h2> &lt;== parent directory</h2></a></b></TD>");
+                       finalHtml.append("</TR>\n");
                }
+
+               finalHtml.append(dirHtml.toString());
+               finalHtml.append("\n<TR><TD><br></TD></TR>\n");
+               finalHtml.append("</TABLE>\n");
+       }
+
+       private void showCurrentPath(final StringBuffer finalHtml) {
+               finalHtml.append("<CENTER><H2>");
+               for (final String p : path)
+                       finalHtml.append(" / " + p);
+               finalHtml.append("</H2></CENTER>\n");
        }
 
 }
Unnamed repository; edit this file 'description' to name the repository.