From e8c05b86fc013a1bd54cf3e5d5cc71b9eda71ed3 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sat, 12 Mar 2016 10:38:07 +0000 Subject: [PATCH] Cleanup --- source/net/filebot/CachedResource.java | 5 ++--- source/net/filebot/mediainfo/MediaInfo.java | 2 +- source/net/filebot/ui/SelectDialog.java | 2 +- source/net/filebot/ui/analyze/MediaInfoTool.java | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/net/filebot/CachedResource.java b/source/net/filebot/CachedResource.java index dd76fb5c..85f33a67 100644 --- a/source/net/filebot/CachedResource.java +++ b/source/net/filebot/CachedResource.java @@ -13,14 +13,13 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; import java.util.function.BiConsumer; -import java.util.function.Consumer; import java.util.function.Function; +import org.w3c.dom.Document; + import net.filebot.util.JsonUtilities; import net.filebot.web.WebRequest; -import org.w3c.dom.Document; - public class CachedResource implements Resource { public static final int DEFAULT_RETRY_LIMIT = 2; diff --git a/source/net/filebot/mediainfo/MediaInfo.java b/source/net/filebot/mediainfo/MediaInfo.java index 6db9c0bb..1dd9b4d1 100644 --- a/source/net/filebot/mediainfo/MediaInfo.java +++ b/source/net/filebot/mediainfo/MediaInfo.java @@ -27,7 +27,7 @@ public class MediaInfo implements Closeable { } } - public synchronized MediaInfo open(File file) throws IOException { + public synchronized MediaInfo open(File file) throws IOException, IllegalArgumentException { if (!file.isFile() || file.length() < 64 * 1024) { throw new IllegalArgumentException("Invalid media file: " + file); } diff --git a/source/net/filebot/ui/SelectDialog.java b/source/net/filebot/ui/SelectDialog.java index c8061bf5..2415c9b9 100644 --- a/source/net/filebot/ui/SelectDialog.java +++ b/source/net/filebot/ui/SelectDialog.java @@ -120,7 +120,7 @@ public class SelectDialog extends JDialog { html.append("• ").append(escapeHTML(n)).append("
"); } } - html.append("
ID:
").append(escapeHTML(Integer.toString(item.getId()))).append(""); + html.append("
ID:
• ").append(Integer.toString(item.getId())).append(""); return html.toString(); } diff --git a/source/net/filebot/ui/analyze/MediaInfoTool.java b/source/net/filebot/ui/analyze/MediaInfoTool.java index 5c3f3350..80aac4c2 100644 --- a/source/net/filebot/ui/analyze/MediaInfoTool.java +++ b/source/net/filebot/ui/analyze/MediaInfoTool.java @@ -74,6 +74,8 @@ class MediaInfoTool extends Tool { }); }); }); + } catch (IllegalArgumentException e) { + debug.finest(e.getMessage()); } catch (Exception e) { debug.warning(e.getMessage()); }