Updated copyright message.

[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 ebc5ca2..acc3c4e 100755 (executable)
--- 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 -- 2018, 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<String> path;
+    private List<String> 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("<HTML>\n");
-            html.append("<HEAD>\n");
-            html.append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
-            html.append("</HEAD>\n");
-            html.append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
-            html.append("<!-- " + Constants.HTML_MAGIC_STRING + " -->\n");
-            html.append("<!-- " + Constants.HTML_MEMO + " -->\n");
-            html.append("<font color=\"#ffffff\">\n");
-        }
+        if (doHtmlHeaderAndFooter)
+            appendHtmlHeader(html);
  
          if (showTitle)
              html.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
@@ -212,11 +201,27 @@ public class MixedLayout implements Layout {
          html.append(filesHtml.toString());
  
          if (doHtmlHeaderAndFooter)
-            html.append("</font></BODY></HTML>\n");
+            appendHtmlFooter(html);
  
          return html.toString();
      }
  
+    private void appendHtmlFooter(StringBuilder html) {
+        html.append("</font></BODY></HTML>\n");
+    }
+
+    private void appendHtmlHeader(StringBuilder html) {
+        // page header
+        html.append("<HTML>\n");
+        html.append("<HEAD>\n");
+        html.append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
+        html.append("</HEAD>\n");
+        html.append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
+        html.append("<!-- " + Constants.HTML_MAGIC_STRING + " -->\n");
+        html.append("<!-- " + Constants.HTML_MEMO + " -->\n");
+        html.append("<font color=\"#ffffff\">\n");
+    }
+
      private String getImageThumbnailUrl(final Picture picture) {
          final Dimension imageSize = picture.getDimensions();