X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=55c4e8016561f7e3decb484088c349aed5aa6be9;hb=492279188d6c1b68b37f7d45177916a0d023d954;hp=ebc5ca2eca7a46177c69f424ed3c3ac195eb9ba1;hpb=1b742640af99284aae1cd10c259254137316ba7c;p=meviz.git 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 ebc5ca2..55c4e80 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java @@ -1,6 +1,6 @@ /* * Meviz - Various tools collection to work with multimedia. - * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Copyright (C) 2012 -- 2017, 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 @@ -19,22 +19,21 @@ import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture; import org.apache.log4j.Logger; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.util.List; public class MixedLayout implements Layout { public static final String encoding = "UTF-8"; - Logger logger = Logger.getLogger(MixedLayout.class); + private final Logger logger = Logger.getLogger(MixedLayout.class); - StringBuffer dirHtml = new StringBuffer(); + private StringBuffer dirHtml = new StringBuffer(); - StringBuffer filesHtml = new StringBuffer(); + private StringBuffer filesHtml = new StringBuffer(); - String galleryTitle; + private String galleryTitle; - List path; + private List path; private AbstractIndexer indexer; @@ -132,8 +131,7 @@ public class MixedLayout implements Layout { */ @Override public void enlistOgv(final AbstractFile abstractFile, - final DirectoryMetadata parentDirectoryMetadata) - throws UnsupportedEncodingException { + final DirectoryMetadata parentDirectoryMetadata) { final GeneralFile file = (GeneralFile) abstractFile; @@ -191,17 +189,8 @@ public class MixedLayout implements Layout { // assemble final page HTML final StringBuilder html = new StringBuilder(); - if (doHtmlHeaderAndFooter) { - // page header - html.append("\n"); - html.append("\n"); - html.append(" \n"); - html.append("\n"); - html.append("\n"); - html.append("\n"); - html.append("\n"); - html.append("\n"); - } + if (doHtmlHeaderAndFooter) + appendHtmlHeader(html); if (showTitle) html.append("

" + galleryTitle + "

\n"); @@ -212,11 +201,27 @@ public class MixedLayout implements Layout { html.append(filesHtml.toString()); if (doHtmlHeaderAndFooter) - html.append("\n"); + appendHtmlFooter(html); return html.toString(); } + private void appendHtmlFooter(StringBuilder html) { + html.append("\n"); + } + + private void appendHtmlHeader(StringBuilder html) { + // page header + html.append("\n"); + html.append("\n"); + html.append(" \n"); + html.append("\n"); + html.append("\n"); + html.append("\n"); + html.append("\n"); + html.append("\n"); + } + private String getImageThumbnailUrl(final Picture picture) { final Dimension imageSize = picture.getDimensions();