X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=986fe339d570e288025f8871ecb9c198f097b3de;hb=55413b4e5a1c3fb76d77e20ea67fd29853083c7e;hp=7963582b0cad0a081a823a2c4822f77d08263312;hpb=ddbd9cbd9c6835c7f130445337fa3b507264eb77;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 7963582..986fe33 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java @@ -1,30 +1,26 @@ /* - * Meviz - Various tools collection to work with multimedia. - * 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 - * as published by the Free Software Foundation. + * Meviz - Various tools collection to work with multimedia. Author: Svjatoslav Agejenko. + * This project is released under Creative Commons Zero (CC0) license. */ + package eu.svjatoslav.meviz.htmlindexer.layouts; import eu.svjatoslav.commons.file.FilePathParser; -import eu.svjatoslav.meviz.htmlindexer.AbstractIndexer; +import eu.svjatoslav.meviz.htmlindexer.indexer.AbstractIndexer; import eu.svjatoslav.meviz.htmlindexer.Constants; import eu.svjatoslav.meviz.htmlindexer.IndexingContext; -import eu.svjatoslav.meviz.htmlindexer.Layout; import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension; import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata; import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile; import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture; +import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Video; import org.apache.log4j.Logger; import java.io.IOException; import java.util.List; import static eu.svjatoslav.commons.file.FilePathParser.getFileNameWithoutExtension; -import static eu.svjatoslav.meviz.htmlindexer.AbstractIndexer.getVideoType; import static eu.svjatoslav.meviz.htmlindexer.Utils.urlEncode; public class MixedLayout implements Layout { @@ -242,25 +238,24 @@ public class MixedLayout implements Layout { } @Override - public void enlistVideo(AbstractFile file) { + public void enlistVideo(Video video) { filesHtml.append("
\n"); // watchable video filesHtml.append(" \n"); filesHtml.append("
\n"); // video title filesHtml.append(" Video: " - + getFileNameWithoutExtension(file.fileName) + + getFileNameWithoutExtension(video.fileName) + "            "); // video download link - filesHtml.append(" download\n"); + filesHtml.append(" download\n"); filesHtml.append("
\n");