From: Svjatoslav Agejenko Date: Thu, 17 Jul 2014 20:27:15 +0000 (+0300) Subject: Upgraded to latest svjatoslav-commons. X-Git-Tag: meviz-1.0~56 X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=commitdiff_plain;h=e07b29a32091b5291a62158021aed3487ea5cd3a;p=meviz.git Upgraded to latest svjatoslav-commons. Removed java applet fallback mode for OGV videos, we assume sane browser from now on. --- diff --git a/pom.xml b/pom.xml index 3e78e15..69c73bb 100755 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ eu.svjatoslav svjatoslavcommons - 1.2-SNAPSHOT + 1.3 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 { + "\"/>\n"); filesHtml.append("
" + FilePathParser - .getFileNameWithoutExtension(picture.fileName) + .getFileNameWithoutExtension(picture.fileName) + "
("); 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("\n"); + .append("\n"); filesHtml.append("\n"); filesHtml.append("\n"); filesHtml.append("
\n"); filesHtml - .append("Video: " - + FilePathParser - .getFileNameWithoutExtension(file.fileName) - + "            "); + .append("Video: " + + FilePathParser + .getFileNameWithoutExtension(file.fileName) + + "            "); filesHtml.append("\n"); finalHtml.append("\n"); finalHtml - .append(" \n"); + .append(" \n"); finalHtml.append("\n"); finalHtml - .append("\n"); + .append("\n"); finalHtml.append("\n"); finalHtml.append("\n"); finalHtml.append("\n"); @@ -241,7 +230,7 @@ public class MixedLayout implements Layout { if (showTitle) finalHtml - .append("

" + galleryTitle + "

\n"); + .append("

" + galleryTitle + "

\n"); finalHtml.append("

"); 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");