From 3af7e217a009fda078509b94e1565465b11dabcd Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 16 Nov 2015 07:47:33 +0000 Subject: [PATCH] * cleanup --- source/net/filebot/Main.java | 1 - source/net/filebot/archive/ExtractCallback.java | 2 +- source/net/filebot/format/ExpressionFormatFunctions.java | 1 - source/net/filebot/mac/MacAppUtilities.java | 1 + source/net/filebot/similarity/DateMatcher.java | 4 ++++ source/net/filebot/ui/rename/Preset.java | 1 - source/net/filebot/ui/rename/PresetEditor.java | 1 - source/net/filebot/ui/subtitle/SubtitleUploadDialog.java | 1 - source/net/filebot/util/WeakValueHashMap.java | 1 + source/net/filebot/web/ShooterSubtitles.java | 2 +- 10 files changed, 8 insertions(+), 7 deletions(-) diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java index 0a318001..a5cbde1e 100644 --- a/source/net/filebot/Main.java +++ b/source/net/filebot/Main.java @@ -15,7 +15,6 @@ import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.nio.ByteBuffer; import java.nio.channels.Channels; diff --git a/source/net/filebot/archive/ExtractCallback.java b/source/net/filebot/archive/ExtractCallback.java index e0fb499f..b8302689 100644 --- a/source/net/filebot/archive/ExtractCallback.java +++ b/source/net/filebot/archive/ExtractCallback.java @@ -9,8 +9,8 @@ import java.io.OutputStream; import net.sf.sevenzipjbinding.ExtractAskMode; import net.sf.sevenzipjbinding.ExtractOperationResult; import net.sf.sevenzipjbinding.IArchiveExtractCallback; -import net.sf.sevenzipjbinding.ISequentialOutStream; import net.sf.sevenzipjbinding.IInArchive; +import net.sf.sevenzipjbinding.ISequentialOutStream; import net.sf.sevenzipjbinding.PropID; import net.sf.sevenzipjbinding.SevenZipException; diff --git a/source/net/filebot/format/ExpressionFormatFunctions.java b/source/net/filebot/format/ExpressionFormatFunctions.java index a5c525fe..790a0836 100644 --- a/source/net/filebot/format/ExpressionFormatFunctions.java +++ b/source/net/filebot/format/ExpressionFormatFunctions.java @@ -3,7 +3,6 @@ package net.filebot.format; import groovy.lang.Closure; import java.io.IOException; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/source/net/filebot/mac/MacAppUtilities.java b/source/net/filebot/mac/MacAppUtilities.java index b7ecdc5e..9d970415 100644 --- a/source/net/filebot/mac/MacAppUtilities.java +++ b/source/net/filebot/mac/MacAppUtilities.java @@ -54,6 +54,7 @@ public class MacAppUtilities { // WARNING: dispatch_sync seems to work on most Mac always causes a deadlock and freezes the application on others (in particular MBP with 2 graphics chips) dispatch_async(new Runnable() { + @Override public void run() { Pointer pool = createAutoreleasePool(); Proxy peer = objc().sendProxy("NSOpenPanel", "openPanel"); diff --git a/source/net/filebot/similarity/DateMatcher.java b/source/net/filebot/similarity/DateMatcher.java index bb8469bf..62fbb0d3 100644 --- a/source/net/filebot/similarity/DateMatcher.java +++ b/source/net/filebot/similarity/DateMatcher.java @@ -108,6 +108,7 @@ public class DateMatcher { return new SimpleDate(Integer.parseInt(match.group(order[0])), Integer.parseInt(match.group(order[1])), Integer.parseInt(match.group(order[2]))); } + @Override public SimpleDate match(CharSequence seq) { Matcher matcher = pattern.matcher(seq); @@ -118,6 +119,7 @@ public class DateMatcher { return null; } + @Override public int find(CharSequence seq, int fromIndex) { Matcher matcher = pattern.matcher(seq).region(fromIndex, seq.length()); @@ -146,6 +148,7 @@ public class DateMatcher { return SimpleDate.parse(space.matcher(match.group()).replaceAll(" "), dateFormat); } + @Override public SimpleDate match(CharSequence seq) { Matcher matcher = pattern.matcher(seq); @@ -156,6 +159,7 @@ public class DateMatcher { return null; } + @Override public int find(CharSequence seq, int fromIndex) { Matcher matcher = pattern.matcher(seq).region(fromIndex, seq.length()); diff --git a/source/net/filebot/ui/rename/Preset.java b/source/net/filebot/ui/rename/Preset.java index 1be1733d..f3657373 100644 --- a/source/net/filebot/ui/rename/Preset.java +++ b/source/net/filebot/ui/rename/Preset.java @@ -6,7 +6,6 @@ import static net.filebot.util.ui.SwingUI.*; import java.awt.event.ActionEvent; import java.io.File; import java.util.List; -import java.util.Locale; import net.filebot.Language; import net.filebot.Settings; diff --git a/source/net/filebot/ui/rename/PresetEditor.java b/source/net/filebot/ui/rename/PresetEditor.java index 9b637a22..3c1a8ed5 100644 --- a/source/net/filebot/ui/rename/PresetEditor.java +++ b/source/net/filebot/ui/rename/PresetEditor.java @@ -12,7 +12,6 @@ import java.awt.event.ActionEvent; import java.io.File; import java.util.EnumSet; import java.util.List; -import java.util.Locale; import java.util.logging.Level; import javax.swing.AbstractAction; diff --git a/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java b/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java index 08ed672e..7aa81517 100644 --- a/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java +++ b/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java @@ -52,7 +52,6 @@ import net.filebot.Language; import net.filebot.ResourceManager; import net.filebot.WebServices; import net.filebot.media.MediaDetection; -import net.filebot.similarity.SeasonEpisodeMatcher; import net.filebot.similarity.SeriesNameMatcher; import net.filebot.ui.LanguageComboBox; import net.filebot.ui.SelectDialog; diff --git a/source/net/filebot/util/WeakValueHashMap.java b/source/net/filebot/util/WeakValueHashMap.java index 4a8ecd0e..8de945b5 100644 --- a/source/net/filebot/util/WeakValueHashMap.java +++ b/source/net/filebot/util/WeakValueHashMap.java @@ -89,6 +89,7 @@ public class WeakValueHashMap extends AbstractMap { return entries; } + @Override public Collection values() { processQueue(); diff --git a/source/net/filebot/web/ShooterSubtitles.java b/source/net/filebot/web/ShooterSubtitles.java index 5a7f5a43..f8bf2118 100644 --- a/source/net/filebot/web/ShooterSubtitles.java +++ b/source/net/filebot/web/ShooterSubtitles.java @@ -148,7 +148,7 @@ public class ShooterSubtitles implements VideoHashSubtitleService { } /** - * + * * @see https://docs.google.com/document/d/1w5MCBO61rKQ6hI5m9laJLWse__yTYdRugpVyz4RzrmM/preview */ protected static String computeFileHash(File file) throws IOException {