From e07b29a32091b5291a62158021aed3487ea5cd3a Mon Sep 17 00:00:00 2001 From: Svjatoslav Agejenko <svjatoslav@svjatoslav.eu> Date: Thu, 17 Jul 2014 23:27:15 +0300 Subject: [PATCH] Upgraded to latest svjatoslav-commons. Removed java applet fallback mode for OGV videos, we assume sane browser from now on. --- pom.xml | 2 +- .../eu/svjatoslav/meviz/bomremove/Main.java | 2 +- .../htmlindexer/layouts/MixedLayout.java | 41 +++++++------------ .../svjatoslav/meviz/textsplitter/Main.java | 8 ++-- .../svjatoslav/meviz/texttruncate/Main.java | 7 ++-- 5 files changed, 24 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 3e78e15..69c73bb 100755 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ <dependency> <groupId>eu.svjatoslav</groupId> <artifactId>svjatoslavcommons</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.3</version> </dependency> <dependency> diff --git a/src/main/java/eu/svjatoslav/meviz/bomremove/Main.java b/src/main/java/eu/svjatoslav/meviz/bomremove/Main.java index 05251ee..9eed788 100755 --- a/src/main/java/eu/svjatoslav/meviz/bomremove/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/bomremove/Main.java @@ -1,7 +1,7 @@ /* * Meviz - Various tools collection to work with multimedia. * Copyright (C) 2012, 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. 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 29e5b00..9585215 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java @@ -1,7 +1,7 @@ /* * Meviz - Various tools collection to work with multimedia. * Copyright (C) 2012, 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. @@ -118,7 +118,7 @@ public class MixedLayout implements Layout { + "\"/></a>\n"); filesHtml.append("<br/><b>" + FilePathParser - .getFileNameWithoutExtension(picture.fileName) + .getFileNameWithoutExtension(picture.fileName) + "</b><br/>("); int count = 0; @@ -142,7 +142,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(abstractFile); } } @@ -157,38 +157,27 @@ public class MixedLayout implements Layout { finishRow(); filesHtml - .append("<TR style=\"background-color: #404040; text-align: center\">\n"); + .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"); filesHtml - .append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\"" - + indexingContext.getGlobalUrl() - + UrlParamEncoder.encode(indexingContext.getLocalUrl() - + "/" + file.fileName) + "\">\n"); - filesHtml.append("</source>\n"); - - // if browser cannot play video directry, fall back to java Applet - filesHtml - .append("<applet code=\"com.fluendo.player.Cortado.class\" archive=\"http://theora.org/cortado.jar\" width=\"800\" height=\"600\">\n"); - filesHtml.append(" <param name=\"url\" value=\"" + .append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\"" + indexingContext.getGlobalUrl() - + UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/" - + file.fileName) + "\"/>\n"); - filesHtml.append(" <param name=\"keepAspect\" value=\"true\"/>\n"); - filesHtml.append(" <param name=\"autoPlay\" value=\"false\"/>\n"); - filesHtml.append("</applet>\n"); + + UrlParamEncoder.encode(indexingContext.getLocalUrl() + + "/" + file.fileName) + "\">\n"); + filesHtml.append("</source>\n"); filesHtml.append("</video>\n"); filesHtml.append("<br/>\n"); filesHtml - .append("Video: <b>" - + FilePathParser - .getFileNameWithoutExtension(file.fileName) - + "<b/> "); + .append("Video: <b>" + + FilePathParser + .getFileNameWithoutExtension(file.fileName) + + "<b/> "); filesHtml.append("<a href=\"" + indexingContext.getGlobalUrl() + UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/" @@ -230,10 +219,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"); @@ -241,7 +230,7 @@ public class MixedLayout implements Layout { if (showTitle) finalHtml - .append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n"); + .append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n"); finalHtml.append("<CENTER><H2>"); for (final String p : path) diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java index e2b85cb..5d8082e 100755 --- a/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java @@ -1,7 +1,7 @@ /* * Meviz - Various tools collection to work with multimedia. * Copyright (C) 2012, 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. @@ -17,7 +17,7 @@ import java.io.FileWriter; import java.io.IOException; import eu.svjatoslav.commons.file.FilePathParser; -import eu.svjatoslav.commons.string.CuttableString; +import eu.svjatoslav.commons.string.String2; import eu.svjatoslav.commons.string.WildCardMatcher; import eu.svjatoslav.meviz.Module; @@ -99,11 +99,11 @@ public class Main implements Module { if (readLine == null) break; - final CuttableString cuttableString = new CuttableString(readLine); + final String2 cuttableString = new String2(readLine); while (!cuttableString.isEmpty()) { for (final String pattern : options.textSplitPatterns) - if (WildCardMatcher.match(cuttableString.getValue(), + if (WildCardMatcher.match(cuttableString.toString(), pattern)) bufferedWriter.write("\n"); diff --git a/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.java b/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.java index 31f7671..a578234 100755 --- a/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.java @@ -1,7 +1,7 @@ /* * Meviz - Various tools collection to work with multimedia. * Copyright (C) 2012, 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. @@ -17,7 +17,7 @@ import java.io.FileWriter; import java.io.IOException; import eu.svjatoslav.commons.file.FilePathParser; -import eu.svjatoslav.commons.string.CuttableString; +import eu.svjatoslav.commons.string.String2; import eu.svjatoslav.commons.string.WildCardMatcher; import eu.svjatoslav.meviz.Module; @@ -109,8 +109,7 @@ public class Main implements Module { bufferedWriter.write(readLine + "\n"); else { - final CuttableString cuttableString = new CuttableString( - readLine); + final String2 cuttableString = new String2(readLine); bufferedWriter.write(cuttableString.cutLeft(targetLineLength) + "\n"); -- 2.20.1