From: Svjatoslav Agejenko Date: Fri, 23 Jun 2017 13:22:55 +0000 (+0200) Subject: Updated copyright. Compatibility fixes for latest svjatoslav-commons. X-Git-Tag: meviz-1.2~38 X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=commitdiff_plain;h=934d5b7cc3d7d4bbafda7fbb4fab47d54f1a8a91;p=meviz.git Updated copyright. Compatibility fixes for latest svjatoslav-commons. --- diff --git a/meviz.iml b/meviz.iml index 924e78a..37a4af7 100644 --- a/meviz.iml +++ b/meviz.iml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9b72bec..4946bde 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ eu.svjatoslav svjatoslavcommons - 1.5 + 1.6-SNAPSHOT diff --git a/src/main/java/eu/svjatoslav/meviz/Main.java b/src/main/java/eu/svjatoslav/meviz/Main.java index d1b9d51..ad014bf 100755 --- a/src/main/java/eu/svjatoslav/meviz/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/Main.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 diff --git a/src/main/java/eu/svjatoslav/meviz/Module.java b/src/main/java/eu/svjatoslav/meviz/Module.java index 73642b0..e2ffe4f 100755 --- a/src/main/java/eu/svjatoslav/meviz/Module.java +++ b/src/main/java/eu/svjatoslav/meviz/Module.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 diff --git a/src/main/java/eu/svjatoslav/meviz/bomremove/BomStrippingOptions.java b/src/main/java/eu/svjatoslav/meviz/bomremove/BomStrippingOptions.java index 364131c..fe3b8ba 100755 --- a/src/main/java/eu/svjatoslav/meviz/bomremove/BomStrippingOptions.java +++ b/src/main/java/eu/svjatoslav/meviz/bomremove/BomStrippingOptions.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 diff --git a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java index 627dbf8..4651fd2 100755 --- a/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.java +++ b/src/main/java/eu/svjatoslav/meviz/bomremove/CommandlineHandler.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 @@ -39,16 +39,16 @@ class CommandlineHandler { if (!parser.parse(args)) return null; - if (recursiveParameter.isParameterSpecified()) + if (recursiveParameter.isSpecified()) options.recursive = true; - if (workingDirectoryParameter.isParameterSpecified()) + if (workingDirectoryParameter.isSpecified()) options.targetDirectory = workingDirectoryParameter.getValue(); else options.targetDirectory = new File(System.getProperty("user.dir")); // TODO: add support for multiple input patterns - if (inputPatternParameter.isParameterSpecified()) + if (inputPatternParameter.isSpecified()) options.inputPatterns.addAll(inputPatternParameter.getValue()); return options; diff --git a/src/main/java/eu/svjatoslav/meviz/bomremove/Main.java b/src/main/java/eu/svjatoslav/meviz/bomremove/Main.java index 65c99da..1ba6934 100755 --- a/src/main/java/eu/svjatoslav/meviz/bomremove/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/bomremove/Main.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/BitrateParameter.java b/src/main/java/eu/svjatoslav/meviz/encoder/BitrateParameter.java index 30a6712..ad4a9f0 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/BitrateParameter.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/BitrateParameter.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 @@ -12,7 +12,7 @@ package eu.svjatoslav.meviz.encoder; import eu.svjatoslav.commons.commandline.parameterparser.ArgumentCount; import eu.svjatoslav.commons.commandline.parameterparser.Parameter; -public class BitrateParameter extends Parameter { +public class BitrateParameter extends Parameter { public BitrateParameter(final String description) { super(description, ArgumentCount.SINGLE); @@ -24,14 +24,14 @@ public class BitrateParameter extends Parameter { } @Override - public bitrate getValue() { - return bitrate.valueOf(arguments.get(0).toUpperCase()); + public Bitrate getValue() { + return Bitrate.valueOf(arguments.get(0).toUpperCase()); } @Override public boolean validate(final String value) { try { - bitrate.valueOf(value.toUpperCase()); + Bitrate.valueOf(value.toUpperCase()); } catch (final IllegalArgumentException exception) { return false; } @@ -39,7 +39,7 @@ public class BitrateParameter extends Parameter { return true; } - public enum bitrate { + public enum Bitrate { NONE, LOW, MEDIUM, HIGH, COPY } } diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java index 367742e..ec65014 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/CommandlineHandler.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 @@ -59,30 +59,30 @@ class CommandlineHandler { parser.parse(args); - options.setRecursive(recursiveParameter.isParameterSpecified()); + options.setRecursive(recursiveParameter.isSpecified()); - options.setDeinterlace(deinterlaceParameter.isParameterSpecified()); + options.setDeinterlace(deinterlaceParameter.isSpecified()); - options.setTestOnly(testParameter.isParameterSpecified()); + options.setTestOnly(testParameter.isSpecified()); - if (outputFormatParameter.isParameterSpecified()) + if (outputFormatParameter.isSpecified()) options.getOutputFormats().addAll(outputFormatParameter.getValue()); - if (targetFramerate.isParameterSpecified()) + if (targetFramerate.isSpecified()) options.setTargetFps(targetFramerate.getValue()); - if (workingDirectoryParameter.isParameterSpecified()) + if (workingDirectoryParameter.isSpecified()) options.setWorkingDirectory(workingDirectoryParameter.getValue()); - if (inputPatternParameter.isParameterSpecified()) + if (inputPatternParameter.isSpecified()) options.getInputPatterns().addAll(inputPatternParameter.getValue()); - options.setForPortablePlayer(forPortableParameter.isParameterSpecified()); + options.setForPortablePlayer(forPortableParameter.isSpecified()); - if (videoBitrateParameter.isParameterSpecified()) + if (videoBitrateParameter.isSpecified()) options.setVideoBitrate(videoBitrateParameter.getValue()); - if (audioBitrateParameter.isParameterSpecified()) + if (audioBitrateParameter.isSpecified()) options.setAudioBitrate(audioBitrateParameter.getValue()); return options; diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java index 2c5d088..e7c9462 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/Encoder.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/EncodingOptions.java b/src/main/java/eu/svjatoslav/meviz/encoder/EncodingOptions.java index 04e86e6..1dbca9b 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/EncodingOptions.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/EncodingOptions.java @@ -1,6 +1,6 @@ /* * Meviz - Various tools collection to work with multimedia. - * Copyright (C) 2012-2015, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Copyright (C) 2012 -- 2017-2015, 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 @@ -15,9 +15,9 @@ import java.util.List; public class EncodingOptions { - private BitrateParameter.bitrate videoBitrate = BitrateParameter.bitrate.MEDIUM; + private BitrateParameter.Bitrate videoBitrate = BitrateParameter.Bitrate.MEDIUM; - private BitrateParameter.bitrate audioBitrate = BitrateParameter.bitrate.MEDIUM; + private BitrateParameter.Bitrate audioBitrate = BitrateParameter.Bitrate.MEDIUM; private Integer targetFps; @@ -35,11 +35,11 @@ public class EncodingOptions { private List inputPatterns = new ArrayList<>(); - public BitrateParameter.bitrate getAudioBitrate() { + public BitrateParameter.Bitrate getAudioBitrate() { return audioBitrate; } - public void setAudioBitrate(final BitrateParameter.bitrate audioBitrate) { + public void setAudioBitrate(final BitrateParameter.Bitrate audioBitrate) { this.audioBitrate = audioBitrate; } @@ -67,11 +67,11 @@ public class EncodingOptions { this.targetFps = targetFps; } - public BitrateParameter.bitrate getVideoBitrate() { + public BitrateParameter.Bitrate getVideoBitrate() { return videoBitrate; } - public void setVideoBitrate(final BitrateParameter.bitrate videoBitrate) { + public void setVideoBitrate(final BitrateParameter.Bitrate videoBitrate) { this.videoBitrate = videoBitrate; } diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/EncodingPlan.java b/src/main/java/eu/svjatoslav/meviz/encoder/EncodingPlan.java index 49c52cc..8bada53 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/EncodingPlan.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/EncodingPlan.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/EncodingTask.java b/src/main/java/eu/svjatoslav/meviz/encoder/EncodingTask.java index 67beb8c..330833e 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/EncodingTask.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/EncodingTask.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.java b/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.java index 9870ced..05e98ac 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/FormatsRegistry.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AbstractConverter.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AbstractConverter.java index 0d935c1..43d4f05 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AbstractConverter.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AbstractConverter.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.java index d0c245c..94dee7d 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvAudio.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java index 9228317..be39365 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/AvconvVideo.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 @@ -9,8 +9,7 @@ package eu.svjatoslav.meviz.encoder.converters; -import eu.svjatoslav.meviz.encoder.BitrateParameter; -import eu.svjatoslav.meviz.encoder.BitrateParameter.bitrate; +import eu.svjatoslav.meviz.encoder.BitrateParameter.Bitrate; import eu.svjatoslav.meviz.encoder.EncodingOptions; import java.io.File; @@ -46,7 +45,7 @@ public class AvconvVideo extends AbstractConverter { return codecParams.toString(); } - private int getAudioBitrateValue(final BitrateParameter.bitrate bitRate) { + private int getAudioBitrateValue(final Bitrate bitRate) { switch (bitRate) { case LOW: return 128; @@ -88,13 +87,13 @@ public class AvconvVideo extends AbstractConverter { codecParams.append("-s 800x600 "); } - if (options.getVideoBitrate() == bitrate.COPY) + if (options.getVideoBitrate() == Bitrate.COPY) videoCodec = "copy"; - if (options.getAudioBitrate() == bitrate.COPY) + if (options.getAudioBitrate() == Bitrate.COPY) audioCodec = "copy"; - if (options.getAudioBitrate() == bitrate.NONE) + if (options.getAudioBitrate() == Bitrate.NONE) audioCodec = null; if (options.isForPortablePlayer()) { @@ -129,7 +128,7 @@ public class AvconvVideo extends AbstractConverter { "webm", "mov"); } - private int getVideoBitrateValue(final BitrateParameter.bitrate bitRate) { + private int getVideoBitrateValue(final Bitrate bitRate) { switch (bitRate) { case LOW: return 1000; diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java index eaf55a5..e1e1249 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Convert.java @@ -1,6 +1,6 @@ /* * Meviz - Various tools collection to work with multimedia. - * Copyright (C) 2012-2017, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Copyright (C) 2012 -- 2017-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 @@ -29,7 +29,7 @@ public class Convert extends AbstractConverter { } private List getSupportedFormats() { - return toList("tif", "tiff", "png", "jpg", "jpeg"); + return toList("tif", "tiff", "png", "jpg", "jpeg", "bmp"); } @Override diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ffmpeg2theora.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ffmpeg2theora.java index e214bd9..a71b8e8 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ffmpeg2theora.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ffmpeg2theora.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Flac.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Flac.java index ac2b468..6ada058 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Flac.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Flac.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Midi2Wav.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Midi2Wav.java index 9478e23..833f236 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Midi2Wav.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Midi2Wav.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ocr.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ocr.java index e4753fe..bbb0816 100644 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ocr.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ocr.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 diff --git a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ogg2Wav.java b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ogg2Wav.java index 57a6d2d..6e4c960 100755 --- a/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ogg2Wav.java +++ b/src/main/java/eu/svjatoslav/meviz/encoder/converters/Ogg2Wav.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 diff --git a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java index ae9f42e..20c2aa1 100755 --- a/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/grabmemcard/Main.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 @@ -50,8 +50,8 @@ public class Main implements Module { private EncodingOptions getEncodingOptions() { final EncodingOptions options = new EncodingOptions(); - options.setVideoBitrate(BitrateParameter.bitrate.COPY); - options.setAudioBitrate(BitrateParameter.bitrate.COPY); + options.setVideoBitrate(BitrateParameter.Bitrate.COPY); + options.setAudioBitrate(BitrateParameter.Bitrate.COPY); return options; } diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java index 497b5b3..88cb94b 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/CommandlineHandler.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 @@ -32,13 +32,13 @@ class CommandlineHandler { .addAliases("-w", "--working-directory").mustExist(); public String getGalleryTitle() { - if (galleryNameParameter.isParameterSpecified()) + if (galleryNameParameter.isSpecified()) return galleryNameParameter.getValue(); return Constants.DEFAULT_GALLERY_TITLE; } public File getWorkingDirectory() { - if (workingDirectoryParameter.isParameterSpecified()) + if (workingDirectoryParameter.isSpecified()) return workingDirectoryParameter.getValue(); else return new File(System.getProperty("user.dir")); diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Constants.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Constants.java index 1cfbe1e..cf60186 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Constants.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Constants.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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java index 6aa927c..2050e2b 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/ImageFormatError.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/ImageFormatError.java index c2089a1..b2b6a7e 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/ImageFormatError.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/ImageFormatError.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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java index f434f92..cab1ebd 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Main.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Main.java index f524490..6c26761 100644 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Main.java @@ -31,7 +31,7 @@ public class Main implements Module { public void run(final String[] args) throws Exception { if (commandlineHandler.parseCommandlineArguments(args)) - if (commandlineHandler.removeIndex.isParameterSpecified()) + if (commandlineHandler.removeIndex.isSpecified()) new FilesystemIndexRemover(commandlineHandler); else new FilesystemIndexer(commandlineHandler.getWorkingDirectory(), diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java index 853b510..374dffc 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.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 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 aae1a19..e20f875 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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/Dimension.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/Dimension.java index 5c144f4..a6ff1dc 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/Dimension.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/Dimension.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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java index 600d65c..bda3b08 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/MetadadaHelper.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/MetadadaHelper.java index 3e75939..428ae60 100644 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/MetadadaHelper.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/MetadadaHelper.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 diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java index 4c3aee7..7c9c2b0 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.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 diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java index ec49573..1ac3044 100755 --- a/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.java +++ b/src/main/java/eu/svjatoslav/meviz/renamer/CommandlineHandler.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 @@ -55,22 +55,22 @@ class CommandlineHandler { if (!parser.parse(args)) return null; - if (testParameter.isParameterSpecified()) + if (testParameter.isSpecified()) options.testOnly = true; - if (recursiveParameter.isParameterSpecified()) + if (recursiveParameter.isSpecified()) options.recursive = true; - if (outputPatternParameter.isParameterSpecified()) + if (outputPatternParameter.isSpecified()) options.outputPattern = outputPatternParameter.getValue(); - if (workingDirectoryParameter.isParameterSpecified()) + if (workingDirectoryParameter.isSpecified()) options.targetDirectory = workingDirectoryParameter.getValue(); else options.targetDirectory = new File(System.getProperty("user.dir")); // TODO: add multiple input patterns support - if (inputPatternParameter.isParameterSpecified()) + if (inputPatternParameter.isSpecified()) options.inputPatterns.addAll(inputPatternParameter.getValue()); return options; diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/Main.java b/src/main/java/eu/svjatoslav/meviz/renamer/Main.java index 073898e..9f221b2 100755 --- a/src/main/java/eu/svjatoslav/meviz/renamer/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/renamer/Main.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 diff --git a/src/main/java/eu/svjatoslav/meviz/renamer/RenamingOptions.java b/src/main/java/eu/svjatoslav/meviz/renamer/RenamingOptions.java index 5670c8e..77773c0 100755 --- a/src/main/java/eu/svjatoslav/meviz/renamer/RenamingOptions.java +++ b/src/main/java/eu/svjatoslav/meviz/renamer/RenamingOptions.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 diff --git a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java index 5c6d44b..1e51d90 100755 --- a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.java +++ b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineHandler.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 @@ -43,18 +43,18 @@ class CommandlineHandler { if (!parser.parse(args)) return null; - if (recursiveParameter.isParameterSpecified()) + if (recursiveParameter.isSpecified()) options.recursive = true; - if (directoryParameter.isParameterSpecified()) + if (directoryParameter.isSpecified()) options.targetDirectory = directoryParameter.getValue(); else options.targetDirectory = new File(System.getProperty("user.dir")); - if (searchForPattern.isParameterSpecified()) + if (searchForPattern.isSpecified()) options.searchForPattern = searchForPattern.getValue(); - if (replaceWithPattern.isParameterSpecified()) + if (replaceWithPattern.isSpecified()) options.replaceWithPattern = replaceWithPattern.getValue(); return options; diff --git a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineOptions.java b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineOptions.java index a522225..01bbf30 100755 --- a/src/main/java/eu/svjatoslav/meviz/replace/CommandlineOptions.java +++ b/src/main/java/eu/svjatoslav/meviz/replace/CommandlineOptions.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 diff --git a/src/main/java/eu/svjatoslav/meviz/replace/Main.java b/src/main/java/eu/svjatoslav/meviz/replace/Main.java index 64c47d7..0bebcc3 100755 --- a/src/main/java/eu/svjatoslav/meviz/replace/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/replace/Main.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 diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java index a07d10c..21a2ed4 100755 --- a/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.java +++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/CommandlineHandler.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 @@ -43,19 +43,19 @@ class CommandlineHandler { if (!parser.parse(args)) return null; - if (recursiveParameter.isParameterSpecified()) + if (recursiveParameter.isSpecified()) options.recursive = true; - if (workingDirectoryParameter.isParameterSpecified()) + if (workingDirectoryParameter.isSpecified()) options.targetDirectory = workingDirectoryParameter.getValue(); else options.targetDirectory = new File(System.getProperty("user.dir")); - if (fileInputPatternsParameter.isParameterSpecified()) + if (fileInputPatternsParameter.isSpecified()) options.fileInputPatterns.addAll(fileInputPatternsParameter .getValue()); - if (splitPatternsParameter.isParameterSpecified()) + if (splitPatternsParameter.isSpecified()) options.textSplitPatterns.addAll(splitPatternsParameter.getValue()); return options; diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java index cad3b05..c955796 100755 --- a/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/Main.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 diff --git a/src/main/java/eu/svjatoslav/meviz/textsplitter/TextSplittingOptions.java b/src/main/java/eu/svjatoslav/meviz/textsplitter/TextSplittingOptions.java index 33365bc..8e7845d 100755 --- a/src/main/java/eu/svjatoslav/meviz/textsplitter/TextSplittingOptions.java +++ b/src/main/java/eu/svjatoslav/meviz/textsplitter/TextSplittingOptions.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 diff --git a/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java b/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java index 5d657e5..eec92d0 100755 --- a/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.java +++ b/src/main/java/eu/svjatoslav/meviz/texttruncate/CommandlineHandler.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 @@ -39,15 +39,15 @@ class CommandlineHandler { if (!parser.parse(args)) return null; - if (recursiveParameter.isParameterSpecified()) + if (recursiveParameter.isSpecified()) options.recursive = true; - if (workingDirectoryParameter.isParameterSpecified()) + if (workingDirectoryParameter.isSpecified()) options.targetDirectory = workingDirectoryParameter.getValue(); else options.targetDirectory = new File(System.getProperty("user.dir")); - if (inputPatternParameter.isParameterSpecified()) + if (inputPatternParameter.isSpecified()) options.inputPatterns.addAll(inputPatternParameter.getValue()); return options; diff --git a/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.java b/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.java index 63d0ad0..4594979 100755 --- a/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.java +++ b/src/main/java/eu/svjatoslav/meviz/texttruncate/Main.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 diff --git a/src/main/java/eu/svjatoslav/meviz/texttruncate/TextTruncatingOptions.java b/src/main/java/eu/svjatoslav/meviz/texttruncate/TextTruncatingOptions.java index 563754e..5550762 100755 --- a/src/main/java/eu/svjatoslav/meviz/texttruncate/TextTruncatingOptions.java +++ b/src/main/java/eu/svjatoslav/meviz/texttruncate/TextTruncatingOptions.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