From 0dc12ec50567c86043566368fc7935522e0f28fb Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 17 May 2009 17:22:44 +0000 Subject: [PATCH] * cleanup: group static imports --- source/net/sourceforge/filebot/Main.java | 2 +- .../net/sourceforge/filebot/format/Define.java | 4 ++-- .../format/EpisodeFormatBindingBean.java | 6 ++---- .../filebot/mediainfo/MediaInfoLibrary.java | 2 +- .../similarity/NameSimilarityMetric.java | 3 ++- .../similarity/NumericSimilarityMetric.java | 2 +- .../filebot/ui/AbstractSearchPanel.java | 3 +-- .../filebot/ui/EpisodeFormatDialog.java | 4 +--- .../filebot/ui/NotificationLoggingHandler.java | 5 ++--- .../filebot/ui/panel/analyze/FileTreePanel.java | 2 +- .../ui/panel/episodelist/EpisodeListPanel.java | 2 +- .../panel/episodelist/SeasonSpinnerEditor.java | 2 +- .../panel/list/FileListTransferablePolicy.java | 5 ++--- .../filebot/ui/panel/list/ListPanel.java | 7 ++----- .../rename/AutoFetchEpisodeListMatcher.java | 3 +-- .../rename/FilesListTransferablePolicy.java | 3 +-- .../rename/NamesListTransferablePolicy.java | 8 +++----- .../filebot/ui/panel/rename/RenameList.java | 2 +- .../ui/panel/rename/ValidateNamesDialog.java | 3 +-- .../filebot/ui/panel/sfv/ChecksumButton.java | 17 +++++------------ .../ui/panel/sfv/ChecksumCellRenderer.java | 5 ++--- .../panel/sfv/ChecksumComputationService.java | 3 +-- .../filebot/ui/panel/sfv/ChecksumTable.java | 2 +- .../sfv/ChecksumTableTransferablePolicy.java | 2 +- .../filebot/ui/panel/sfv/SfvPanel.java | 6 +++--- .../ui/panel/subtitle/SubtitlePanel.java | 3 +-- .../ui/transfer/LazyTextFileTransferable.java | 4 ++-- .../sourceforge/filebot/web/AnidbClient.java | 9 ++------- .../net/sourceforge/filebot/web/IMDbClient.java | 9 +++------ .../filebot/web/SubsceneSubtitleClient.java | 9 ++------- .../filebot/web/SubtitleSourceClient.java | 5 ++--- .../web/SubtitleSourceSubtitleDescriptor.java | 2 +- .../sourceforge/filebot/web/TVDotComClient.java | 7 ++----- .../sourceforge/filebot/web/TVRageClient.java | 10 +++------- .../sourceforge/filebot/web/TheTVDBClient.java | 9 +++------ .../notification/QueueNotificationLayout.java | 3 +-- .../notification/SimpleNotificationLayout.java | 2 +- .../sourceforge/filebot/ArgumentBeanTest.java | 4 +--- .../filebot/format/ExpressionFormatTest.java | 3 +-- .../filebot/hash/VerificationFormatTest.java | 2 +- .../similarity/NameSimilarityMetricTest.java | 2 +- .../similarity/NumericSimilarityMetricTest.java | 2 +- .../similarity/SeasonEpisodeMatcherTest.java | 4 ++-- .../SeasonEpisodeSimilarityMetricTest.java | 2 +- .../similarity/SeriesNameMatcherTest.java | 4 +--- .../filebot/ui/panel/rename/MatchModelTest.java | 3 +-- .../filebot/web/AnidbClientTest.java | 2 +- .../sourceforge/filebot/web/IMDbClientTest.java | 2 +- .../filebot/web/OpenSubtitlesHasherTest.java | 2 +- .../filebot/web/SubsceneSubtitleClientTest.java | 2 +- .../filebot/web/SubtitleSourceClientTest.java | 3 +-- .../filebot/web/TVDotComClientTest.java | 3 +-- .../filebot/web/TVRageClientTest.java | 2 +- .../filebot/web/TheTVDBClientTest.java | 4 +--- .../tuned/ByteBufferOutputStreamTest.java | 2 +- .../sourceforge/tuned/FilterIteratorTest.java | 3 +-- .../sourceforge/tuned/PreferencesListTest.java | 3 +-- .../sourceforge/tuned/PreferencesMapTest.java | 4 +--- .../net/sourceforge/tuned/TreeIteratorTest.java | 4 +--- 59 files changed, 86 insertions(+), 151 deletions(-) diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java index 812b5875..be4b74b1 100644 --- a/source/net/sourceforge/filebot/Main.java +++ b/source/net/sourceforge/filebot/Main.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot; -import static javax.swing.JFrame.EXIT_ON_CLOSE; +import static javax.swing.JFrame.*; import java.security.CodeSource; import java.security.Permission; diff --git a/source/net/sourceforge/filebot/format/Define.java b/source/net/sourceforge/filebot/format/Define.java index db9bbaef..694590f9 100644 --- a/source/net/sourceforge/filebot/format/Define.java +++ b/source/net/sourceforge/filebot/format/Define.java @@ -2,8 +2,8 @@ package net.sourceforge.filebot.format; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/source/net/sourceforge/filebot/format/EpisodeFormatBindingBean.java b/source/net/sourceforge/filebot/format/EpisodeFormatBindingBean.java index 112edf45..06434b0a 100644 --- a/source/net/sourceforge/filebot/format/EpisodeFormatBindingBean.java +++ b/source/net/sourceforge/filebot/format/EpisodeFormatBindingBean.java @@ -2,10 +2,8 @@ package net.sourceforge.filebot.format; -import static net.sourceforge.filebot.FileBotUtilities.MOVIE_FILES; -import static net.sourceforge.filebot.FileBotUtilities.SFV_FILES; -import static net.sourceforge.filebot.FileBotUtilities.SUBTITLE_FILES; -import static net.sourceforge.filebot.format.Define.undefined; +import static net.sourceforge.filebot.FileBotUtilities.*; +import static net.sourceforge.filebot.format.Define.*; import java.io.File; import java.io.FileInputStream; diff --git a/source/net/sourceforge/filebot/mediainfo/MediaInfoLibrary.java b/source/net/sourceforge/filebot/mediainfo/MediaInfoLibrary.java index 516405c3..226d23e1 100644 --- a/source/net/sourceforge/filebot/mediainfo/MediaInfoLibrary.java +++ b/source/net/sourceforge/filebot/mediainfo/MediaInfoLibrary.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.mediainfo; -import static java.util.Collections.singletonMap; +import static java.util.Collections.*; import java.lang.reflect.Method; diff --git a/source/net/sourceforge/filebot/similarity/NameSimilarityMetric.java b/source/net/sourceforge/filebot/similarity/NameSimilarityMetric.java index 4372f4f5..fc9bfcd1 100644 --- a/source/net/sourceforge/filebot/similarity/NameSimilarityMetric.java +++ b/source/net/sourceforge/filebot/similarity/NameSimilarityMetric.java @@ -2,7 +2,8 @@ package net.sourceforge.filebot.similarity; -import static net.sourceforge.filebot.FileBotUtilities.removeEmbeddedChecksum; +import static net.sourceforge.filebot.FileBotUtilities.*; + import uk.ac.shef.wit.simmetrics.similaritymetrics.AbstractStringMetric; import uk.ac.shef.wit.simmetrics.similaritymetrics.MongeElkan; import uk.ac.shef.wit.simmetrics.tokenisers.TokeniserQGram3Extended; diff --git a/source/net/sourceforge/filebot/similarity/NumericSimilarityMetric.java b/source/net/sourceforge/filebot/similarity/NumericSimilarityMetric.java index 79780e21..20c74e3d 100644 --- a/source/net/sourceforge/filebot/similarity/NumericSimilarityMetric.java +++ b/source/net/sourceforge/filebot/similarity/NumericSimilarityMetric.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.similarity; -import static net.sourceforge.filebot.FileBotUtilities.removeEmbeddedChecksum; +import static net.sourceforge.filebot.FileBotUtilities.*; import java.util.ArrayList; import java.util.HashSet; diff --git a/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java b/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java index 7f7e1a9a..2e5579f8 100644 --- a/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java +++ b/source/net/sourceforge/filebot/ui/AbstractSearchPanel.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.ui; -import static javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER; -import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED; +import static javax.swing.ScrollPaneConstants.*; import java.awt.Window; import java.awt.event.ActionEvent; diff --git a/source/net/sourceforge/filebot/ui/EpisodeFormatDialog.java b/source/net/sourceforge/filebot/ui/EpisodeFormatDialog.java index 54b165e9..dbc9a82e 100644 --- a/source/net/sourceforge/filebot/ui/EpisodeFormatDialog.java +++ b/source/net/sourceforge/filebot/ui/EpisodeFormatDialog.java @@ -2,9 +2,7 @@ package net.sourceforge.filebot.ui; -import static java.awt.Font.BOLD; -import static java.awt.Font.MONOSPACED; -import static java.awt.Font.PLAIN; +import static java.awt.Font.*; import java.awt.Color; import java.awt.Font; diff --git a/source/net/sourceforge/filebot/ui/NotificationLoggingHandler.java b/source/net/sourceforge/filebot/ui/NotificationLoggingHandler.java index a891c14c..fede5bf9 100644 --- a/source/net/sourceforge/filebot/ui/NotificationLoggingHandler.java +++ b/source/net/sourceforge/filebot/ui/NotificationLoggingHandler.java @@ -2,9 +2,8 @@ package net.sourceforge.filebot.ui; -import static net.sourceforge.filebot.Settings.getApplicationName; -import static net.sourceforge.tuned.ui.notification.Direction.NORTH; -import static net.sourceforge.tuned.ui.notification.Direction.SOUTH; +import static net.sourceforge.filebot.Settings.*; +import static net.sourceforge.tuned.ui.notification.Direction.*; import java.util.logging.Handler; import java.util.logging.Level; diff --git a/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java b/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java index 818a5bec..08fb6794 100644 --- a/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java +++ b/source/net/sourceforge/filebot/ui/panel/analyze/FileTreePanel.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.ui.panel.analyze; -import static net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy.LOADING_PROPERTY; +import static net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy.*; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; diff --git a/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java b/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java index 5739a2e2..06e9dd9b 100644 --- a/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java +++ b/source/net/sourceforge/filebot/ui/panel/episodelist/EpisodeListPanel.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.ui.panel.episodelist; -import static net.sourceforge.filebot.ui.panel.episodelist.SeasonSpinnerModel.ALL_SEASONS; +import static net.sourceforge.filebot.ui.panel.episodelist.SeasonSpinnerModel.*; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; diff --git a/source/net/sourceforge/filebot/ui/panel/episodelist/SeasonSpinnerEditor.java b/source/net/sourceforge/filebot/ui/panel/episodelist/SeasonSpinnerEditor.java index 40e9bbd0..efdf846a 100644 --- a/source/net/sourceforge/filebot/ui/panel/episodelist/SeasonSpinnerEditor.java +++ b/source/net/sourceforge/filebot/ui/panel/episodelist/SeasonSpinnerEditor.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.ui.panel.episodelist; -import static net.sourceforge.filebot.ui.panel.episodelist.SeasonSpinnerModel.ALL_SEASONS; +import static net.sourceforge.filebot.ui.panel.episodelist.SeasonSpinnerModel.*; import java.awt.Color; import java.text.ParseException; diff --git a/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java index 11c04180..39315063 100644 --- a/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/list/FileListTransferablePolicy.java @@ -2,9 +2,8 @@ package net.sourceforge.filebot.ui.panel.list; -import static net.sourceforge.filebot.FileBotUtilities.TORRENT_FILES; -import static net.sourceforge.tuned.FileUtilities.FOLDERS; -import static net.sourceforge.tuned.FileUtilities.containsOnly; +import static net.sourceforge.filebot.FileBotUtilities.*; +import static net.sourceforge.tuned.FileUtilities.*; import java.io.File; import java.io.IOException; diff --git a/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java b/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java index 421eaedd..055c47be 100644 --- a/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java +++ b/source/net/sourceforge/filebot/ui/panel/list/ListPanel.java @@ -2,11 +2,8 @@ package net.sourceforge.filebot.ui.panel.list; -import static java.awt.Font.MONOSPACED; -import static java.awt.Font.PLAIN; -import static java.lang.Math.max; -import static java.lang.Math.min; -import static java.lang.Math.signum; +import static java.awt.Font.*; +import static java.lang.Math.*; import java.awt.BorderLayout; import java.awt.Font; diff --git a/source/net/sourceforge/filebot/ui/panel/rename/AutoFetchEpisodeListMatcher.java b/source/net/sourceforge/filebot/ui/panel/rename/AutoFetchEpisodeListMatcher.java index a1917435..dcb68d37 100644 --- a/source/net/sourceforge/filebot/ui/panel/rename/AutoFetchEpisodeListMatcher.java +++ b/source/net/sourceforge/filebot/ui/panel/rename/AutoFetchEpisodeListMatcher.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.ui.panel.rename; -import static net.sourceforge.filebot.FileBotUtilities.MOVIE_FILES; -import static net.sourceforge.filebot.FileBotUtilities.SUBTITLE_FILES; +import static net.sourceforge.filebot.FileBotUtilities.*; import java.io.File; import java.io.FileFilter; diff --git a/source/net/sourceforge/filebot/ui/panel/rename/FilesListTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/rename/FilesListTransferablePolicy.java index 3db771dc..c5e35643 100644 --- a/source/net/sourceforge/filebot/ui/panel/rename/FilesListTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/rename/FilesListTransferablePolicy.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.ui.panel.rename; -import static net.sourceforge.tuned.FileUtilities.FOLDERS; -import static net.sourceforge.tuned.FileUtilities.containsOnly; +import static net.sourceforge.tuned.FileUtilities.*; import java.io.File; import java.util.List; diff --git a/source/net/sourceforge/filebot/ui/panel/rename/NamesListTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/rename/NamesListTransferablePolicy.java index 1863fd3d..a40ecfff 100644 --- a/source/net/sourceforge/filebot/ui/panel/rename/NamesListTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/rename/NamesListTransferablePolicy.java @@ -2,11 +2,9 @@ package net.sourceforge.filebot.ui.panel.rename; -import static java.awt.datatransfer.DataFlavor.stringFlavor; -import static net.sourceforge.filebot.FileBotUtilities.LIST_FILES; -import static net.sourceforge.filebot.FileBotUtilities.TORRENT_FILES; -import static net.sourceforge.tuned.FileUtilities.FOLDERS; -import static net.sourceforge.tuned.FileUtilities.containsOnly; +import static java.awt.datatransfer.DataFlavor.*; +import static net.sourceforge.filebot.FileBotUtilities.*; +import static net.sourceforge.tuned.FileUtilities.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; diff --git a/source/net/sourceforge/filebot/ui/panel/rename/RenameList.java b/source/net/sourceforge/filebot/ui/panel/rename/RenameList.java index 858381e5..e43ff47c 100644 --- a/source/net/sourceforge/filebot/ui/panel/rename/RenameList.java +++ b/source/net/sourceforge/filebot/ui/panel/rename/RenameList.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.ui.panel.rename; -import static java.util.Collections.swap; +import static java.util.Collections.*; import java.awt.BorderLayout; import java.awt.event.ActionEvent; diff --git a/source/net/sourceforge/filebot/ui/panel/rename/ValidateNamesDialog.java b/source/net/sourceforge/filebot/ui/panel/rename/ValidateNamesDialog.java index 2068a6ea..d28416fe 100644 --- a/source/net/sourceforge/filebot/ui/panel/rename/ValidateNamesDialog.java +++ b/source/net/sourceforge/filebot/ui/panel/rename/ValidateNamesDialog.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.ui.panel.rename; -import static net.sourceforge.filebot.FileBotUtilities.INVALID_CHARACTERS_PATTERN; -import static net.sourceforge.filebot.FileBotUtilities.validateFileName; +import static net.sourceforge.filebot.FileBotUtilities.*; import java.awt.AlphaComposite; import java.awt.Color; diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumButton.java b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumButton.java index fa007d60..b411bf8f 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumButton.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumButton.java @@ -2,18 +2,11 @@ package net.sourceforge.filebot.ui.panel.sfv; -import static java.awt.Color.WHITE; -import static java.awt.Cursor.DEFAULT_CURSOR; -import static java.awt.Cursor.HAND_CURSOR; -import static java.awt.Cursor.getPredefinedCursor; -import static java.awt.Font.DIALOG; -import static java.awt.Font.PLAIN; -import static java.awt.RenderingHints.KEY_RENDERING; -import static java.awt.RenderingHints.KEY_TEXT_ANTIALIASING; -import static java.awt.RenderingHints.VALUE_RENDER_QUALITY; -import static java.awt.RenderingHints.VALUE_TEXT_ANTIALIAS_ON; -import static java.lang.Math.max; -import static java.lang.Math.round; +import static java.awt.Color.*; +import static java.awt.Cursor.*; +import static java.awt.Font.*; +import static java.awt.RenderingHints.*; +import static java.lang.Math.*; import java.awt.Dimension; import java.awt.Font; diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumCellRenderer.java b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumCellRenderer.java index 555b5eb2..c962f00e 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumCellRenderer.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumCellRenderer.java @@ -2,9 +2,8 @@ package net.sourceforge.filebot.ui.panel.sfv; -import static java.awt.Font.BOLD; -import static java.awt.Font.PLAIN; -import static net.sourceforge.tuned.ui.TunedUtilities.derive; +import static java.awt.Font.*; +import static net.sourceforge.tuned.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumComputationService.java b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumComputationService.java index 67b1ccc7..6d2e0920 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumComputationService.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumComputationService.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.ui.panel.sfv; -import static java.lang.Math.log10; -import static java.lang.Math.max; +import static java.lang.Math.*; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTable.java b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTable.java index aa9e8e82..987adc0f 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTable.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTable.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.ui.panel.sfv; -import static net.sourceforge.filebot.FileBotUtilities.EMBEDDED_CHECKSUM_PATTERN; +import static net.sourceforge.filebot.FileBotUtilities.*; import java.awt.Color; diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTableTransferablePolicy.java b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTableTransferablePolicy.java index 62a9a004..4c4067d6 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTableTransferablePolicy.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/ChecksumTableTransferablePolicy.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.ui.panel.sfv; -import static net.sourceforge.tuned.FileUtilities.containsOnly; +import static net.sourceforge.tuned.FileUtilities.*; import java.io.File; import java.io.IOException; diff --git a/source/net/sourceforge/filebot/ui/panel/sfv/SfvPanel.java b/source/net/sourceforge/filebot/ui/panel/sfv/SfvPanel.java index 042850fc..22f35190 100644 --- a/source/net/sourceforge/filebot/ui/panel/sfv/SfvPanel.java +++ b/source/net/sourceforge/filebot/ui/panel/sfv/SfvPanel.java @@ -2,9 +2,9 @@ package net.sourceforge.filebot.ui.panel.sfv; -import static java.lang.Math.min; -import static net.sourceforge.filebot.ui.panel.sfv.ChecksumTableModel.HASH_TYPE_PROPERTY; -import static net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy.LOADING_PROPERTY; +import static java.lang.Math.*; +import static net.sourceforge.filebot.ui.panel.sfv.ChecksumTableModel.*; +import static net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy.*; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; diff --git a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java index f410d089..b7d1339b 100644 --- a/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java +++ b/source/net/sourceforge/filebot/ui/panel/subtitle/SubtitlePanel.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.ui.panel.subtitle; -import static net.sourceforge.filebot.Settings.getApplicationName; -import static net.sourceforge.filebot.Settings.getApplicationVersion; +import static net.sourceforge.filebot.Settings.*; import java.net.URI; import java.util.ArrayList; diff --git a/source/net/sourceforge/filebot/ui/transfer/LazyTextFileTransferable.java b/source/net/sourceforge/filebot/ui/transfer/LazyTextFileTransferable.java index d9d32b2c..b55e1f9f 100644 --- a/source/net/sourceforge/filebot/ui/transfer/LazyTextFileTransferable.java +++ b/source/net/sourceforge/filebot/ui/transfer/LazyTextFileTransferable.java @@ -2,8 +2,8 @@ package net.sourceforge.filebot.ui.transfer; -import static net.sourceforge.filebot.FileBotUtilities.validateFileName; -import static net.sourceforge.filebot.Settings.getApplicationName; +import static net.sourceforge.filebot.FileBotUtilities.*; +import static net.sourceforge.filebot.Settings.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; diff --git a/source/net/sourceforge/filebot/web/AnidbClient.java b/source/net/sourceforge/filebot/web/AnidbClient.java index 70b3a033..cbf5a793 100644 --- a/source/net/sourceforge/filebot/web/AnidbClient.java +++ b/source/net/sourceforge/filebot/web/AnidbClient.java @@ -2,13 +2,8 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.WebRequest.getHtmlDocument; -import static net.sourceforge.tuned.XPathUtilities.exists; -import static net.sourceforge.tuned.XPathUtilities.getAttribute; -import static net.sourceforge.tuned.XPathUtilities.getTextContent; -import static net.sourceforge.tuned.XPathUtilities.selectNode; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; -import static net.sourceforge.tuned.XPathUtilities.selectString; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.IOException; import java.net.MalformedURLException; diff --git a/source/net/sourceforge/filebot/web/IMDbClient.java b/source/net/sourceforge/filebot/web/IMDbClient.java index 5f72b790..acb09a94 100644 --- a/source/net/sourceforge/filebot/web/IMDbClient.java +++ b/source/net/sourceforge/filebot/web/IMDbClient.java @@ -2,12 +2,9 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.EpisodeListUtilities.filterBySeason; -import static net.sourceforge.filebot.web.EpisodeListUtilities.getLastSeason; -import static net.sourceforge.filebot.web.WebRequest.getHtmlDocument; -import static net.sourceforge.tuned.XPathUtilities.getAttribute; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; -import static net.sourceforge.tuned.XPathUtilities.selectString; +import static net.sourceforge.filebot.web.EpisodeListUtilities.*; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.IOException; import java.net.URI; diff --git a/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java b/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java index d1663249..ac77afa5 100644 --- a/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java +++ b/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java @@ -2,13 +2,8 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.WebRequest.getHtmlDocument; -import static net.sourceforge.tuned.XPathUtilities.getAttribute; -import static net.sourceforge.tuned.XPathUtilities.getChild; -import static net.sourceforge.tuned.XPathUtilities.getChildren; -import static net.sourceforge.tuned.XPathUtilities.getTextContent; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; -import static net.sourceforge.tuned.XPathUtilities.selectString; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.IOException; import java.net.MalformedURLException; diff --git a/source/net/sourceforge/filebot/web/SubtitleSourceClient.java b/source/net/sourceforge/filebot/web/SubtitleSourceClient.java index ebfe79e1..bad4712a 100644 --- a/source/net/sourceforge/filebot/web/SubtitleSourceClient.java +++ b/source/net/sourceforge/filebot/web/SubtitleSourceClient.java @@ -2,9 +2,8 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.WebRequest.getDocument; -import static net.sourceforge.tuned.XPathUtilities.getTextContent; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.net.URI; import java.net.URISyntaxException; diff --git a/source/net/sourceforge/filebot/web/SubtitleSourceSubtitleDescriptor.java b/source/net/sourceforge/filebot/web/SubtitleSourceSubtitleDescriptor.java index 25416f26..af459188 100644 --- a/source/net/sourceforge/filebot/web/SubtitleSourceSubtitleDescriptor.java +++ b/source/net/sourceforge/filebot/web/SubtitleSourceSubtitleDescriptor.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.SubtitleSourceClient.HOST; +import static net.sourceforge.filebot.web.SubtitleSourceClient.*; import java.net.MalformedURLException; import java.net.URL; diff --git a/source/net/sourceforge/filebot/web/TVDotComClient.java b/source/net/sourceforge/filebot/web/TVDotComClient.java index e1e7aec1..3511b356 100644 --- a/source/net/sourceforge/filebot/web/TVDotComClient.java +++ b/source/net/sourceforge/filebot/web/TVDotComClient.java @@ -2,11 +2,8 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.WebRequest.getHtmlDocument; -import static net.sourceforge.tuned.XPathUtilities.getAttribute; -import static net.sourceforge.tuned.XPathUtilities.getTextContent; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; -import static net.sourceforge.tuned.XPathUtilities.selectString; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.IOException; import java.net.URI; diff --git a/source/net/sourceforge/filebot/web/TVRageClient.java b/source/net/sourceforge/filebot/web/TVRageClient.java index 2fa11e9c..cfcb6fee 100644 --- a/source/net/sourceforge/filebot/web/TVRageClient.java +++ b/source/net/sourceforge/filebot/web/TVRageClient.java @@ -2,13 +2,9 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.EpisodeListUtilities.filterBySeason; -import static net.sourceforge.filebot.web.EpisodeListUtilities.getLastSeason; -import static net.sourceforge.filebot.web.WebRequest.getDocument; -import static net.sourceforge.tuned.XPathUtilities.getAttribute; -import static net.sourceforge.tuned.XPathUtilities.getTextContent; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; -import static net.sourceforge.tuned.XPathUtilities.selectString; +import static net.sourceforge.filebot.web.EpisodeListUtilities.*; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.IOException; import java.net.URI; diff --git a/source/net/sourceforge/filebot/web/TheTVDBClient.java b/source/net/sourceforge/filebot/web/TheTVDBClient.java index 93a0e947..6a51792e 100644 --- a/source/net/sourceforge/filebot/web/TheTVDBClient.java +++ b/source/net/sourceforge/filebot/web/TheTVDBClient.java @@ -2,12 +2,9 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.EpisodeListUtilities.filterBySeason; -import static net.sourceforge.filebot.web.EpisodeListUtilities.getLastSeason; -import static net.sourceforge.filebot.web.WebRequest.getDocument; -import static net.sourceforge.tuned.XPathUtilities.getTextContent; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; -import static net.sourceforge.tuned.XPathUtilities.selectString; +import static net.sourceforge.filebot.web.EpisodeListUtilities.*; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/source/net/sourceforge/tuned/ui/notification/QueueNotificationLayout.java b/source/net/sourceforge/tuned/ui/notification/QueueNotificationLayout.java index 3bac7841..42ba7259 100644 --- a/source/net/sourceforge/tuned/ui/notification/QueueNotificationLayout.java +++ b/source/net/sourceforge/tuned/ui/notification/QueueNotificationLayout.java @@ -5,8 +5,7 @@ package net.sourceforge.tuned.ui.notification; -import static net.sourceforge.tuned.ui.notification.Direction.SOUTH_EAST; -import static net.sourceforge.tuned.ui.notification.Direction.WEST; +import static net.sourceforge.tuned.ui.notification.Direction.*; import java.awt.Dimension; import java.awt.GraphicsConfiguration; diff --git a/source/net/sourceforge/tuned/ui/notification/SimpleNotificationLayout.java b/source/net/sourceforge/tuned/ui/notification/SimpleNotificationLayout.java index b6c0e7d2..3d42d046 100644 --- a/source/net/sourceforge/tuned/ui/notification/SimpleNotificationLayout.java +++ b/source/net/sourceforge/tuned/ui/notification/SimpleNotificationLayout.java @@ -5,7 +5,7 @@ package net.sourceforge.tuned.ui.notification; -import static net.sourceforge.tuned.ui.notification.Direction.NORTH; +import static net.sourceforge.tuned.ui.notification.Direction.*; import java.awt.Dimension; import java.awt.Insets; diff --git a/test/net/sourceforge/filebot/ArgumentBeanTest.java b/test/net/sourceforge/filebot/ArgumentBeanTest.java index c219ac5e..49d8956a 100644 --- a/test/net/sourceforge/filebot/ArgumentBeanTest.java +++ b/test/net/sourceforge/filebot/ArgumentBeanTest.java @@ -2,9 +2,7 @@ package net.sourceforge.filebot; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import org.junit.Test; import org.kohsuke.args4j.CmdLineException; diff --git a/test/net/sourceforge/filebot/format/ExpressionFormatTest.java b/test/net/sourceforge/filebot/format/ExpressionFormatTest.java index 616e791a..45160e35 100644 --- a/test/net/sourceforge/filebot/format/ExpressionFormatTest.java +++ b/test/net/sourceforge/filebot/format/ExpressionFormatTest.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.format; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import javax.script.Bindings; import javax.script.Compilable; diff --git a/test/net/sourceforge/filebot/hash/VerificationFormatTest.java b/test/net/sourceforge/filebot/hash/VerificationFormatTest.java index c1f3a74f..785f7a51 100644 --- a/test/net/sourceforge/filebot/hash/VerificationFormatTest.java +++ b/test/net/sourceforge/filebot/hash/VerificationFormatTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.hash; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.io.File; import java.util.Map.Entry; diff --git a/test/net/sourceforge/filebot/similarity/NameSimilarityMetricTest.java b/test/net/sourceforge/filebot/similarity/NameSimilarityMetricTest.java index b1231040..ff4f5153 100644 --- a/test/net/sourceforge/filebot/similarity/NameSimilarityMetricTest.java +++ b/test/net/sourceforge/filebot/similarity/NameSimilarityMetricTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.similarity; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import org.junit.Test; diff --git a/test/net/sourceforge/filebot/similarity/NumericSimilarityMetricTest.java b/test/net/sourceforge/filebot/similarity/NumericSimilarityMetricTest.java index 86dda2b2..e9c18c43 100644 --- a/test/net/sourceforge/filebot/similarity/NumericSimilarityMetricTest.java +++ b/test/net/sourceforge/filebot/similarity/NumericSimilarityMetricTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.similarity; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java b/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java index bddc84ef..35955c5c 100644 --- a/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java +++ b/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java @@ -2,8 +2,8 @@ package net.sourceforge.filebot.similarity; -import static net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE.UNDEFINED; -import static org.junit.Assert.assertEquals; +import static net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE.*; +import static org.junit.Assert.*; import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; import org.junit.Test; diff --git a/test/net/sourceforge/filebot/similarity/SeasonEpisodeSimilarityMetricTest.java b/test/net/sourceforge/filebot/similarity/SeasonEpisodeSimilarityMetricTest.java index a6a3a543..348ac681 100644 --- a/test/net/sourceforge/filebot/similarity/SeasonEpisodeSimilarityMetricTest.java +++ b/test/net/sourceforge/filebot/similarity/SeasonEpisodeSimilarityMetricTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.similarity; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import org.junit.Test; diff --git a/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java b/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java index 812b2936..d3575c8b 100644 --- a/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java +++ b/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java @@ -2,9 +2,7 @@ package net.sourceforge.filebot.similarity; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import net.sourceforge.filebot.similarity.SeriesNameMatcher.SeriesNameCollection; import org.junit.Test; diff --git a/test/net/sourceforge/filebot/ui/panel/rename/MatchModelTest.java b/test/net/sourceforge/filebot/ui/panel/rename/MatchModelTest.java index c2425b5c..31a800bf 100644 --- a/test/net/sourceforge/filebot/ui/panel/rename/MatchModelTest.java +++ b/test/net/sourceforge/filebot/ui/panel/rename/MatchModelTest.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.ui.panel.rename; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/test/net/sourceforge/filebot/web/AnidbClientTest.java b/test/net/sourceforge/filebot/web/AnidbClientTest.java index eb9855da..49f2f115 100644 --- a/test/net/sourceforge/filebot/web/AnidbClientTest.java +++ b/test/net/sourceforge/filebot/web/AnidbClientTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.net.URL; import java.util.List; diff --git a/test/net/sourceforge/filebot/web/IMDbClientTest.java b/test/net/sourceforge/filebot/web/IMDbClientTest.java index 9f0c65e5..dce1931b 100644 --- a/test/net/sourceforge/filebot/web/IMDbClientTest.java +++ b/test/net/sourceforge/filebot/web/IMDbClientTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.List; diff --git a/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java b/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java index 4c226f83..5081caa6 100644 --- a/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java +++ b/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.io.File; import java.io.FileInputStream; diff --git a/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java b/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java index 67edaf3f..094c7aa4 100644 --- a/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java +++ b/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.net.URL; import java.util.List; diff --git a/test/net/sourceforge/filebot/web/SubtitleSourceClientTest.java b/test/net/sourceforge/filebot/web/SubtitleSourceClientTest.java index 2e338413..30dd473d 100644 --- a/test/net/sourceforge/filebot/web/SubtitleSourceClientTest.java +++ b/test/net/sourceforge/filebot/web/SubtitleSourceClientTest.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.List; import java.util.Locale; diff --git a/test/net/sourceforge/filebot/web/TVDotComClientTest.java b/test/net/sourceforge/filebot/web/TVDotComClientTest.java index 8c3eee4b..2a353757 100644 --- a/test/net/sourceforge/filebot/web/TVDotComClientTest.java +++ b/test/net/sourceforge/filebot/web/TVDotComClientTest.java @@ -2,8 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.net.URL; import java.util.List; diff --git a/test/net/sourceforge/filebot/web/TVRageClientTest.java b/test/net/sourceforge/filebot/web/TVRageClientTest.java index cd6f873d..5da833db 100644 --- a/test/net/sourceforge/filebot/web/TVRageClientTest.java +++ b/test/net/sourceforge/filebot/web/TVRageClientTest.java @@ -2,7 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.List; diff --git a/test/net/sourceforge/filebot/web/TheTVDBClientTest.java b/test/net/sourceforge/filebot/web/TheTVDBClientTest.java index c7759ce5..76136d0a 100644 --- a/test/net/sourceforge/filebot/web/TheTVDBClientTest.java +++ b/test/net/sourceforge/filebot/web/TheTVDBClientTest.java @@ -2,9 +2,7 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.EnumSet; import java.util.List; diff --git a/test/net/sourceforge/tuned/ByteBufferOutputStreamTest.java b/test/net/sourceforge/tuned/ByteBufferOutputStreamTest.java index 9edb62ce..072fb043 100644 --- a/test/net/sourceforge/tuned/ByteBufferOutputStreamTest.java +++ b/test/net/sourceforge/tuned/ByteBufferOutputStreamTest.java @@ -2,7 +2,7 @@ package net.sourceforge.tuned; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/test/net/sourceforge/tuned/FilterIteratorTest.java b/test/net/sourceforge/tuned/FilterIteratorTest.java index 4438e618..d406eaae 100644 --- a/test/net/sourceforge/tuned/FilterIteratorTest.java +++ b/test/net/sourceforge/tuned/FilterIteratorTest.java @@ -2,8 +2,7 @@ package net.sourceforge.tuned; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Iterator; diff --git a/test/net/sourceforge/tuned/PreferencesListTest.java b/test/net/sourceforge/tuned/PreferencesListTest.java index b2e5a40a..4dce08c6 100644 --- a/test/net/sourceforge/tuned/PreferencesListTest.java +++ b/test/net/sourceforge/tuned/PreferencesListTest.java @@ -2,8 +2,7 @@ package net.sourceforge.tuned; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; diff --git a/test/net/sourceforge/tuned/PreferencesMapTest.java b/test/net/sourceforge/tuned/PreferencesMapTest.java index b4a97687..8271a24a 100644 --- a/test/net/sourceforge/tuned/PreferencesMapTest.java +++ b/test/net/sourceforge/tuned/PreferencesMapTest.java @@ -2,9 +2,7 @@ package net.sourceforge.tuned; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.Arrays; import java.util.Collection; diff --git a/test/net/sourceforge/tuned/TreeIteratorTest.java b/test/net/sourceforge/tuned/TreeIteratorTest.java index cc5b0271..17af4eaf 100644 --- a/test/net/sourceforge/tuned/TreeIteratorTest.java +++ b/test/net/sourceforge/tuned/TreeIteratorTest.java @@ -2,9 +2,7 @@ package net.sourceforge.tuned; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Iterator;