From 169959c81375d86063081fee5b9c4ad04d13caf3 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 11 Sep 2013 17:22:00 +0000 Subject: [PATCH] * Organize Imports --- .../net/sourceforge/filebot/WebServices.java | 8 +-- .../archive/ArchiveOpenVolumeCallback.java | 16 +++-- .../filebot/archive/ExtractOutProvider.java | 4 +- .../filebot/archive/ExtractOutStream.java | 7 +- .../filebot/cli/CmdlineOperations.java | 65 ++++--------------- .../filebot/format/MediaBindingBean.java | 32 ++++----- .../filebot/hash/VerificationFileReader.java | 2 +- .../filebot/media/MediaDetection.java | 24 ++----- .../filebot/media/ReleaseInfo.java | 19 +++--- .../filebot/similarity/EpisodeMetrics.java | 25 ++----- .../similarity/SeasonEpisodeMatcher.java | 8 +-- .../filebot/similarity/SubstringMetric.java | 2 +- .../ui/episodelist/SeasonSpinnerEditor.java | 2 +- .../filebot/ui/list/ListPanel.java | 2 +- .../filebot/ui/rename/RenameList.java | 3 +- .../sourceforge/filebot/vfs/RarArchive.java | 1 - .../sourceforge/filebot/web/AnidbClient.java | 10 +-- source/net/sourceforge/filebot/web/Date.java | 4 +- .../net/sourceforge/filebot/web/FanartTV.java | 5 +- .../sourceforge/filebot/web/IMDbClient.java | 9 +-- .../sourceforge/filebot/web/LocalSearch.java | 5 +- .../filebot/web/SerienjunkiesClient.java | 5 +- .../sourceforge/filebot/web/TMDbClient.java | 7 +- .../filebot/web/TheTVDBClient.java | 14 ++-- .../sourceforge/filebot/FileBotTestSuite.java | 8 +-- .../similarity/SeasonEpisodeMatcherTest.java | 6 +- .../similarity/SeriesNameMatcherTest.java | 3 +- .../filebot/web/IMDbClientTest.java | 2 +- .../filebot/web/SerienjunkiesClientTest.java | 2 +- .../sourceforge/tuned/PreferencesMapTest.java | 6 +- 30 files changed, 107 insertions(+), 199 deletions(-) diff --git a/source/net/sourceforge/filebot/WebServices.java b/source/net/sourceforge/filebot/WebServices.java index 47b3f010..c0ccf8c4 100644 --- a/source/net/sourceforge/filebot/WebServices.java +++ b/source/net/sourceforge/filebot/WebServices.java @@ -2,11 +2,9 @@ package net.sourceforge.filebot; -import static java.util.Arrays.asList; -import static java.util.Collections.emptyList; -import static net.sourceforge.filebot.Settings.getApplicationName; -import static net.sourceforge.filebot.Settings.getApplicationProperty; -import static net.sourceforge.filebot.Settings.getApplicationVersion; +import static java.util.Arrays.*; +import static java.util.Collections.*; +import static net.sourceforge.filebot.Settings.*; import java.io.IOException; import java.util.ArrayList; diff --git a/source/net/sourceforge/filebot/archive/ArchiveOpenVolumeCallback.java b/source/net/sourceforge/filebot/archive/ArchiveOpenVolumeCallback.java index a2bd7422..83ddf1b6 100644 --- a/source/net/sourceforge/filebot/archive/ArchiveOpenVolumeCallback.java +++ b/source/net/sourceforge/filebot/archive/ArchiveOpenVolumeCallback.java @@ -2,11 +2,19 @@ package net.sourceforge.filebot.archive; -import java.io.*; -import java.util.*; +import java.io.Closeable; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.HashMap; +import java.util.Map; -import net.sf.sevenzipjbinding.*; -import net.sf.sevenzipjbinding.impl.*; +import net.sf.sevenzipjbinding.IArchiveOpenCallback; +import net.sf.sevenzipjbinding.IArchiveOpenVolumeCallback; +import net.sf.sevenzipjbinding.IInStream; +import net.sf.sevenzipjbinding.PropID; +import net.sf.sevenzipjbinding.SevenZipException; +import net.sf.sevenzipjbinding.impl.RandomAccessFileInStream; class ArchiveOpenVolumeCallback implements IArchiveOpenVolumeCallback, IArchiveOpenCallback, Closeable { diff --git a/source/net/sourceforge/filebot/archive/ExtractOutProvider.java b/source/net/sourceforge/filebot/archive/ExtractOutProvider.java index 28829144..5fb02b0c 100644 --- a/source/net/sourceforge/filebot/archive/ExtractOutProvider.java +++ b/source/net/sourceforge/filebot/archive/ExtractOutProvider.java @@ -2,7 +2,9 @@ package net.sourceforge.filebot.archive; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; public interface ExtractOutProvider { diff --git a/source/net/sourceforge/filebot/archive/ExtractOutStream.java b/source/net/sourceforge/filebot/archive/ExtractOutStream.java index 7ebf7e19..deafaf99 100644 --- a/source/net/sourceforge/filebot/archive/ExtractOutStream.java +++ b/source/net/sourceforge/filebot/archive/ExtractOutStream.java @@ -2,9 +2,12 @@ package net.sourceforge.filebot.archive; -import java.io.*; +import java.io.Closeable; +import java.io.IOException; +import java.io.OutputStream; -import net.sf.sevenzipjbinding.*; +import net.sf.sevenzipjbinding.ISequentialOutStream; +import net.sf.sevenzipjbinding.SevenZipException; class ExtractOutStream implements ISequentialOutStream, Closeable { diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/sourceforge/filebot/cli/CmdlineOperations.java index e594061f..eddf287d 100644 --- a/source/net/sourceforge/filebot/cli/CmdlineOperations.java +++ b/source/net/sourceforge/filebot/cli/CmdlineOperations.java @@ -1,59 +1,16 @@ package net.sourceforge.filebot.cli; -import static java.lang.String.format; -import static java.util.Arrays.asList; -import static java.util.Collections.addAll; -import static java.util.Collections.emptyList; -import static java.util.Collections.emptyMap; -import static java.util.Collections.emptySet; -import static java.util.Collections.sort; -import static net.sourceforge.filebot.MediaTypes.AUDIO_FILES; -import static net.sourceforge.filebot.MediaTypes.NFO_FILES; -import static net.sourceforge.filebot.MediaTypes.SUBTITLE_FILES; -import static net.sourceforge.filebot.MediaTypes.VIDEO_FILES; -import static net.sourceforge.filebot.Settings.isUnixFS; -import static net.sourceforge.filebot.Settings.useExtendedFileAttributes; -import static net.sourceforge.filebot.WebServices.AcoustID; -import static net.sourceforge.filebot.WebServices.TheTVDB; -import static net.sourceforge.filebot.WebServices.getEpisodeListProvider; -import static net.sourceforge.filebot.WebServices.getMovieIdentificationService; -import static net.sourceforge.filebot.WebServices.getMusicIdentificationService; -import static net.sourceforge.filebot.cli.CLILogging.CLILogger; -import static net.sourceforge.filebot.hash.VerificationUtilities.computeHash; -import static net.sourceforge.filebot.hash.VerificationUtilities.getHashType; -import static net.sourceforge.filebot.hash.VerificationUtilities.getHashTypeByExtension; -import static net.sourceforge.filebot.media.MediaDetection.detectMovie; -import static net.sourceforge.filebot.media.MediaDetection.detectSeriesNames; -import static net.sourceforge.filebot.media.MediaDetection.getClutterFileFilter; -import static net.sourceforge.filebot.media.MediaDetection.grepMovie; -import static net.sourceforge.filebot.media.MediaDetection.guessMovieFolder; -import static net.sourceforge.filebot.media.MediaDetection.isDiskFolder; -import static net.sourceforge.filebot.media.MediaDetection.isEpisode; -import static net.sourceforge.filebot.media.MediaDetection.mapSeriesNamesByFiles; -import static net.sourceforge.filebot.media.MediaDetection.stripReleaseInfo; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.exportSubtitles; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.fetchSubtitle; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.findSubtitles; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.formatSubtitle; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.getSubtitleFormatByName; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.matchSubtitles; -import static net.sourceforge.tuned.FileUtilities.FILES; -import static net.sourceforge.tuned.FileUtilities.FOLDERS; -import static net.sourceforge.tuned.FileUtilities.containsOnly; -import static net.sourceforge.tuned.FileUtilities.createTextReader; -import static net.sourceforge.tuned.FileUtilities.filter; -import static net.sourceforge.tuned.FileUtilities.getExtension; -import static net.sourceforge.tuned.FileUtilities.getName; -import static net.sourceforge.tuned.FileUtilities.isDerived; -import static net.sourceforge.tuned.FileUtilities.isInvalidFilePath; -import static net.sourceforge.tuned.FileUtilities.listPath; -import static net.sourceforge.tuned.FileUtilities.mapByExtension; -import static net.sourceforge.tuned.FileUtilities.mapByFolder; -import static net.sourceforge.tuned.FileUtilities.normalizePathSeparators; -import static net.sourceforge.tuned.FileUtilities.not; -import static net.sourceforge.tuned.FileUtilities.validateFileName; -import static net.sourceforge.tuned.FileUtilities.validateFilePath; -import static net.sourceforge.tuned.FileUtilities.writeFile; +import static java.lang.String.*; +import static java.util.Arrays.*; +import static java.util.Collections.*; +import static net.sourceforge.filebot.MediaTypes.*; +import static net.sourceforge.filebot.Settings.*; +import static net.sourceforge.filebot.WebServices.*; +import static net.sourceforge.filebot.cli.CLILogging.*; +import static net.sourceforge.filebot.hash.VerificationUtilities.*; +import static net.sourceforge.filebot.media.MediaDetection.*; +import static net.sourceforge.filebot.subtitle.SubtitleUtilities.*; +import static net.sourceforge.tuned.FileUtilities.*; import java.io.File; import java.io.FileFilter; diff --git a/source/net/sourceforge/filebot/format/MediaBindingBean.java b/source/net/sourceforge/filebot/format/MediaBindingBean.java index 01b9abd0..8492877c 100644 --- a/source/net/sourceforge/filebot/format/MediaBindingBean.java +++ b/source/net/sourceforge/filebot/format/MediaBindingBean.java @@ -1,26 +1,16 @@ package net.sourceforge.filebot.format; -import static java.util.Arrays.asList; -import static java.util.Arrays.sort; -import static java.util.Collections.singleton; -import static net.sourceforge.filebot.MediaTypes.SUBTITLE_FILES; -import static net.sourceforge.filebot.MediaTypes.VIDEO_FILES; -import static net.sourceforge.filebot.Settings.useExtendedFileAttributes; -import static net.sourceforge.filebot.format.Define.undefined; -import static net.sourceforge.filebot.hash.VerificationUtilities.computeHash; -import static net.sourceforge.filebot.hash.VerificationUtilities.getEmbeddedChecksum; -import static net.sourceforge.filebot.hash.VerificationUtilities.getHashFromVerificationFile; -import static net.sourceforge.filebot.media.MediaDetection.releaseInfo; -import static net.sourceforge.filebot.media.MediaDetection.stripReleaseInfo; -import static net.sourceforge.filebot.similarity.Normalization.removeTrailingBrackets; -import static net.sourceforge.filebot.web.EpisodeFormat.SeasonEpisode; -import static net.sourceforge.tuned.FileUtilities.filter; -import static net.sourceforge.tuned.FileUtilities.hasExtension; -import static net.sourceforge.tuned.FileUtilities.isDerived; -import static net.sourceforge.tuned.FileUtilities.listFiles; -import static net.sourceforge.tuned.FileUtilities.readFile; -import static net.sourceforge.tuned.FileUtilities.replacePathSeparators; -import static net.sourceforge.tuned.StringUtilities.join; +import static java.util.Arrays.*; +import static java.util.Collections.*; +import static net.sourceforge.filebot.MediaTypes.*; +import static net.sourceforge.filebot.Settings.*; +import static net.sourceforge.filebot.format.Define.*; +import static net.sourceforge.filebot.hash.VerificationUtilities.*; +import static net.sourceforge.filebot.media.MediaDetection.*; +import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.sourceforge.filebot.web.EpisodeFormat.*; +import static net.sourceforge.tuned.FileUtilities.*; +import static net.sourceforge.tuned.StringUtilities.*; import java.io.File; import java.io.IOException; diff --git a/source/net/sourceforge/filebot/hash/VerificationFileReader.java b/source/net/sourceforge/filebot/hash/VerificationFileReader.java index d054d0c0..5864c5a8 100644 --- a/source/net/sourceforge/filebot/hash/VerificationFileReader.java +++ b/source/net/sourceforge/filebot/hash/VerificationFileReader.java @@ -7,9 +7,9 @@ import java.io.File; import java.io.IOException; import java.text.ParseException; import java.util.Iterator; +import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Scanner; -import java.util.Map.Entry; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/sourceforge/filebot/media/MediaDetection.java index 01164ec2..4f18b7b4 100644 --- a/source/net/sourceforge/filebot/media/MediaDetection.java +++ b/source/net/sourceforge/filebot/media/MediaDetection.java @@ -1,22 +1,12 @@ package net.sourceforge.filebot.media; -import static java.util.Collections.addAll; -import static java.util.Collections.emptyList; -import static java.util.Collections.reverseOrder; -import static java.util.Collections.singleton; -import static java.util.Collections.sort; -import static java.util.Collections.synchronizedMap; -import static java.util.regex.Pattern.compile; -import static net.sourceforge.filebot.MediaTypes.NFO_FILES; -import static net.sourceforge.filebot.Settings.useExtendedFileAttributes; -import static net.sourceforge.filebot.similarity.CommonSequenceMatcher.getLenientCollator; -import static net.sourceforge.filebot.similarity.Normalization.normalizeBrackets; -import static net.sourceforge.filebot.similarity.Normalization.normalizePunctuation; -import static net.sourceforge.tuned.FileUtilities.filter; -import static net.sourceforge.tuned.FileUtilities.getName; -import static net.sourceforge.tuned.FileUtilities.listFiles; -import static net.sourceforge.tuned.FileUtilities.mapByFolder; -import static net.sourceforge.tuned.FileUtilities.readFile; +import static java.util.Collections.*; +import static java.util.regex.Pattern.*; +import static net.sourceforge.filebot.MediaTypes.*; +import static net.sourceforge.filebot.Settings.*; +import static net.sourceforge.filebot.similarity.CommonSequenceMatcher.*; +import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.sourceforge.tuned.FileUtilities.*; import java.io.File; import java.io.FileFilter; diff --git a/source/net/sourceforge/filebot/media/ReleaseInfo.java b/source/net/sourceforge/filebot/media/ReleaseInfo.java index b145e0d0..8b4560e1 100644 --- a/source/net/sourceforge/filebot/media/ReleaseInfo.java +++ b/source/net/sourceforge/filebot/media/ReleaseInfo.java @@ -1,16 +1,13 @@ package net.sourceforge.filebot.media; -import static java.lang.Integer.parseInt; -import static java.util.Arrays.asList; -import static java.util.Arrays.copyOfRange; -import static java.util.Collections.unmodifiableMap; -import static java.util.ResourceBundle.getBundle; -import static java.util.regex.Pattern.CASE_INSENSITIVE; -import static java.util.regex.Pattern.UNICODE_CASE; -import static java.util.regex.Pattern.compile; -import static net.sourceforge.filebot.similarity.Normalization.normalizePunctuation; -import static net.sourceforge.tuned.FileUtilities.readCSV; -import static net.sourceforge.tuned.StringUtilities.join; +import static java.lang.Integer.*; +import static java.util.Arrays.*; +import static java.util.Collections.*; +import static java.util.ResourceBundle.*; +import static java.util.regex.Pattern.*; +import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.sourceforge.tuned.FileUtilities.*; +import static net.sourceforge.tuned.StringUtilities.*; import java.io.File; import java.io.FileFilter; diff --git a/source/net/sourceforge/filebot/similarity/EpisodeMetrics.java b/source/net/sourceforge/filebot/similarity/EpisodeMetrics.java index 4f154902..bd190464 100644 --- a/source/net/sourceforge/filebot/similarity/EpisodeMetrics.java +++ b/source/net/sourceforge/filebot/similarity/EpisodeMetrics.java @@ -1,23 +1,12 @@ package net.sourceforge.filebot.similarity; -import static java.lang.Math.ceil; -import static java.lang.Math.floor; -import static java.lang.Math.max; -import static java.lang.Math.min; -import static java.util.Arrays.asList; -import static java.util.Collections.emptyMap; -import static java.util.Collections.emptySet; -import static java.util.Collections.singleton; -import static java.util.Collections.synchronizedMap; -import static net.sourceforge.filebot.Settings.useExtendedFileAttributes; -import static net.sourceforge.filebot.similarity.Normalization.normalizePunctuation; -import static net.sourceforge.filebot.similarity.Normalization.removeEmbeddedChecksum; -import static net.sourceforge.filebot.similarity.Normalization.removeTrailingBrackets; -import static net.sourceforge.tuned.FileUtilities.getName; -import static net.sourceforge.tuned.FileUtilities.getNameWithoutExtension; -import static net.sourceforge.tuned.FileUtilities.getRelativePathTail; -import static net.sourceforge.tuned.FileUtilities.normalizePathSeparators; -import static net.sourceforge.tuned.StringUtilities.join; +import static java.lang.Math.*; +import static java.util.Arrays.*; +import static java.util.Collections.*; +import static net.sourceforge.filebot.Settings.*; +import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.sourceforge.tuned.FileUtilities.*; +import static net.sourceforge.tuned.StringUtilities.*; import java.io.File; import java.io.IOException; diff --git a/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java b/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java index ce4f76b5..22387dce 100644 --- a/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java +++ b/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java @@ -2,11 +2,9 @@ package net.sourceforge.filebot.similarity; -import static java.util.Arrays.asList; -import static java.util.Collections.singleton; -import static java.util.regex.Pattern.CASE_INSENSITIVE; -import static java.util.regex.Pattern.UNICODE_CASE; -import static java.util.regex.Pattern.compile; +import static java.util.Arrays.*; +import static java.util.Collections.*; +import static java.util.regex.Pattern.*; import java.io.File; import java.util.ArrayList; diff --git a/source/net/sourceforge/filebot/similarity/SubstringMetric.java b/source/net/sourceforge/filebot/similarity/SubstringMetric.java index 9471235c..060cb40f 100644 --- a/source/net/sourceforge/filebot/similarity/SubstringMetric.java +++ b/source/net/sourceforge/filebot/similarity/SubstringMetric.java @@ -1,6 +1,6 @@ package net.sourceforge.filebot.similarity; -import static net.sourceforge.filebot.similarity.Normalization.normalizePunctuation; +import static net.sourceforge.filebot.similarity.Normalization.*; public class SubstringMetric implements SimilarityMetric { diff --git a/source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerEditor.java b/source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerEditor.java index 898ab6bd..2df97175 100644 --- a/source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerEditor.java +++ b/source/net/sourceforge/filebot/ui/episodelist/SeasonSpinnerEditor.java @@ -11,8 +11,8 @@ import java.util.regex.Pattern; import javax.swing.BorderFactory; import javax.swing.JSpinner; -import javax.swing.SwingConstants; import javax.swing.JSpinner.DefaultEditor; +import javax.swing.SwingConstants; import javax.swing.text.DefaultFormatter; import javax.swing.text.DefaultFormatterFactory; diff --git a/source/net/sourceforge/filebot/ui/list/ListPanel.java b/source/net/sourceforge/filebot/ui/list/ListPanel.java index f72fedce..7993c33f 100644 --- a/source/net/sourceforge/filebot/ui/list/ListPanel.java +++ b/source/net/sourceforge/filebot/ui/list/ListPanel.java @@ -25,10 +25,10 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSpinner; +import javax.swing.JSpinner.NumberEditor; import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.SpinnerNumberModel; -import javax.swing.JSpinner.NumberEditor; import net.miginfocom.swing.MigLayout; import net.sourceforge.filebot.format.ExpressionFormat; diff --git a/source/net/sourceforge/filebot/ui/rename/RenameList.java b/source/net/sourceforge/filebot/ui/rename/RenameList.java index f65b096e..683309ed 100644 --- a/source/net/sourceforge/filebot/ui/rename/RenameList.java +++ b/source/net/sourceforge/filebot/ui/rename/RenameList.java @@ -14,13 +14,12 @@ import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.ListSelectionModel; -import ca.odell.glazedlists.EventList; - import net.miginfocom.swing.MigLayout; import net.sourceforge.filebot.ResourceManager; import net.sourceforge.filebot.ui.FileBotList; import net.sourceforge.filebot.ui.transfer.LoadAction; import net.sourceforge.filebot.ui.transfer.TransferablePolicy; +import ca.odell.glazedlists.EventList; class RenameList extends FileBotList { diff --git a/source/net/sourceforge/filebot/vfs/RarArchive.java b/source/net/sourceforge/filebot/vfs/RarArchive.java index 8d230497..12715d38 100644 --- a/source/net/sourceforge/filebot/vfs/RarArchive.java +++ b/source/net/sourceforge/filebot/vfs/RarArchive.java @@ -11,7 +11,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.sourceforge.tuned.ByteBufferOutputStream; - import de.innosystec.unrar.Archive; import de.innosystec.unrar.exception.RarException; import de.innosystec.unrar.rarfile.FileHeader; diff --git a/source/net/sourceforge/filebot/web/AnidbClient.java b/source/net/sourceforge/filebot/web/AnidbClient.java index e496b640..5ece7541 100644 --- a/source/net/sourceforge/filebot/web/AnidbClient.java +++ b/source/net/sourceforge/filebot/web/AnidbClient.java @@ -1,12 +1,8 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.EpisodeUtilities.sortEpisodes; -import static net.sourceforge.filebot.web.WebRequest.getDocument; -import static net.sourceforge.tuned.XPathUtilities.getAttribute; -import static net.sourceforge.tuned.XPathUtilities.getChild; -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.EpisodeUtilities.*; +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/Date.java b/source/net/sourceforge/filebot/web/Date.java index e614fce0..50f1dbb8 100644 --- a/source/net/sourceforge/filebot/web/Date.java +++ b/source/net/sourceforge/filebot/web/Date.java @@ -2,9 +2,7 @@ package net.sourceforge.filebot.web; -import static java.util.Calendar.DAY_OF_MONTH; -import static java.util.Calendar.MONTH; -import static java.util.Calendar.YEAR; +import static java.util.Calendar.*; import java.io.Serializable; import java.text.ParseException; diff --git a/source/net/sourceforge/filebot/web/FanartTV.java b/source/net/sourceforge/filebot/web/FanartTV.java index ebbba4c7..ecfd8cb6 100644 --- a/source/net/sourceforge/filebot/web/FanartTV.java +++ b/source/net/sourceforge/filebot/web/FanartTV.java @@ -2,9 +2,8 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.WebRequest.getDocument; -import static net.sourceforge.tuned.XPathUtilities.getAttribute; -import static net.sourceforge.tuned.XPathUtilities.selectNodes; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.File; import java.io.Serializable; diff --git a/source/net/sourceforge/filebot/web/IMDbClient.java b/source/net/sourceforge/filebot/web/IMDbClient.java index f4ee4f89..afec9b7e 100644 --- a/source/net/sourceforge/filebot/web/IMDbClient.java +++ b/source/net/sourceforge/filebot/web/IMDbClient.java @@ -2,13 +2,8 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.WebRequest.encode; -import static net.sourceforge.filebot.web.WebRequest.getDocument; -import static net.sourceforge.filebot.web.WebRequest.getHtmlDocument; -import static net.sourceforge.filebot.web.WebRequest.getReader; -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.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.File; import java.io.FileNotFoundException; diff --git a/source/net/sourceforge/filebot/web/LocalSearch.java b/source/net/sourceforge/filebot/web/LocalSearch.java index 1f9bc121..8a2353c8 100644 --- a/source/net/sourceforge/filebot/web/LocalSearch.java +++ b/source/net/sourceforge/filebot/web/LocalSearch.java @@ -1,8 +1,7 @@ package net.sourceforge.filebot.web; -import static java.util.Collections.singleton; -import static java.util.Collections.sort; -import static net.sourceforge.filebot.similarity.Normalization.normalizePunctuation; +import static java.util.Collections.*; +import static net.sourceforge.filebot.similarity.Normalization.*; import java.util.AbstractList; import java.util.AbstractMap.SimpleEntry; diff --git a/source/net/sourceforge/filebot/web/SerienjunkiesClient.java b/source/net/sourceforge/filebot/web/SerienjunkiesClient.java index 30b73256..2fa167fa 100644 --- a/source/net/sourceforge/filebot/web/SerienjunkiesClient.java +++ b/source/net/sourceforge/filebot/web/SerienjunkiesClient.java @@ -1,8 +1,7 @@ package net.sourceforge.filebot.web; -import static net.sourceforge.filebot.web.EpisodeUtilities.sortEpisodes; -import static net.sourceforge.filebot.web.WebRequest.createIgnoreCertificateSocketFactory; -import static net.sourceforge.filebot.web.WebRequest.getReader; +import static net.sourceforge.filebot.web.EpisodeUtilities.*; +import static net.sourceforge.filebot.web.WebRequest.*; import java.io.IOException; import java.io.Reader; diff --git a/source/net/sourceforge/filebot/web/TMDbClient.java b/source/net/sourceforge/filebot/web/TMDbClient.java index b9ea1a5a..f53cc26b 100644 --- a/source/net/sourceforge/filebot/web/TMDbClient.java +++ b/source/net/sourceforge/filebot/web/TMDbClient.java @@ -1,9 +1,8 @@ package net.sourceforge.filebot.web; -import static java.util.Arrays.asList; -import static java.util.Collections.singletonMap; -import static java.util.Collections.unmodifiableList; -import static net.sourceforge.filebot.web.WebRequest.encodeParameters; +import static java.util.Arrays.*; +import static java.util.Collections.*; +import static net.sourceforge.filebot.web.WebRequest.*; import java.io.File; import java.io.FileNotFoundException; diff --git a/source/net/sourceforge/filebot/web/TheTVDBClient.java b/source/net/sourceforge/filebot/web/TheTVDBClient.java index f1c02869..75f6dda5 100644 --- a/source/net/sourceforge/filebot/web/TheTVDBClient.java +++ b/source/net/sourceforge/filebot/web/TheTVDBClient.java @@ -1,15 +1,9 @@ package net.sourceforge.filebot.web; -import static java.util.Arrays.asList; -import static net.sourceforge.filebot.web.EpisodeUtilities.filterBySeason; -import static net.sourceforge.filebot.web.EpisodeUtilities.sortEpisodes; -import static net.sourceforge.filebot.web.WebRequest.encode; -import static net.sourceforge.filebot.web.WebRequest.getDocument; -import static net.sourceforge.tuned.XPathUtilities.getIntegerContent; -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 java.util.Arrays.*; +import static net.sourceforge.filebot.web.EpisodeUtilities.*; +import static net.sourceforge.filebot.web.WebRequest.*; +import static net.sourceforge.tuned.XPathUtilities.*; import java.io.FileNotFoundException; import java.io.Serializable; diff --git a/test/net/sourceforge/filebot/FileBotTestSuite.java b/test/net/sourceforge/filebot/FileBotTestSuite.java index f3086a60..2a10f40a 100644 --- a/test/net/sourceforge/filebot/FileBotTestSuite.java +++ b/test/net/sourceforge/filebot/FileBotTestSuite.java @@ -2,10 +2,6 @@ package net.sourceforge.filebot; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - import net.sourceforge.filebot.format.ExpressionFormatTest; import net.sourceforge.filebot.hash.VerificationFormatTest; import net.sourceforge.filebot.media.ReleaseInfoTest; @@ -15,6 +11,10 @@ import net.sourceforge.filebot.subtitle.SubtitleReaderTestSuite; import net.sourceforge.filebot.ui.rename.MatchModelTest; import net.sourceforge.filebot.web.WebTestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + @RunWith(Suite.class) @SuiteClasses( { SimilarityTestSuite.class, WebTestSuite.class, ExpressionFormatTest.class, VerificationFormatTest.class, MatchModelTest.class, EpisodeMetricsTest.class, SubtitleReaderTestSuite.class, ReleaseInfoTest.class }) diff --git a/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java b/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java index ac1ec751..2e3ad677 100644 --- a/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java +++ b/test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java @@ -1,8 +1,8 @@ package net.sourceforge.filebot.similarity; -import static java.util.Arrays.asList; -import static net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE.UNDEFINED; -import static org.junit.Assert.assertEquals; +import static java.util.Arrays.*; +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/SeriesNameMatcherTest.java b/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java index 1c716b2b..643fda5e 100644 --- a/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java +++ b/test/net/sourceforge/filebot/similarity/SeriesNameMatcherTest.java @@ -3,11 +3,10 @@ package net.sourceforge.filebot.similarity; import static org.junit.Assert.*; +import net.sourceforge.filebot.similarity.SeriesNameMatcher.SeriesNameCollection; import org.junit.Test; -import net.sourceforge.filebot.similarity.SeriesNameMatcher.SeriesNameCollection; - public class SeriesNameMatcherTest { diff --git a/test/net/sourceforge/filebot/web/IMDbClientTest.java b/test/net/sourceforge/filebot/web/IMDbClientTest.java index 79c0cfe6..0cf72858 100644 --- a/test/net/sourceforge/filebot/web/IMDbClientTest.java +++ b/test/net/sourceforge/filebot/web/IMDbClientTest.java @@ -1,6 +1,6 @@ package net.sourceforge.filebot.web; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.List; import java.util.Locale; diff --git a/test/net/sourceforge/filebot/web/SerienjunkiesClientTest.java b/test/net/sourceforge/filebot/web/SerienjunkiesClientTest.java index 848fb307..80bb20e0 100644 --- a/test/net/sourceforge/filebot/web/SerienjunkiesClientTest.java +++ b/test/net/sourceforge/filebot/web/SerienjunkiesClientTest.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; import java.util.Locale; diff --git a/test/net/sourceforge/tuned/PreferencesMapTest.java b/test/net/sourceforge/tuned/PreferencesMapTest.java index fb8deabe..a31cddbb 100644 --- a/test/net/sourceforge/tuned/PreferencesMapTest.java +++ b/test/net/sourceforge/tuned/PreferencesMapTest.java @@ -11,13 +11,13 @@ import java.util.Map; import java.util.Map.Entry; import java.util.prefs.Preferences; +import net.sourceforge.tuned.PreferencesMap.SerializableAdapter; +import net.sourceforge.tuned.PreferencesMap.SimpleAdapter; + import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import net.sourceforge.tuned.PreferencesMap.SerializableAdapter; -import net.sourceforge.tuned.PreferencesMap.SimpleAdapter; - public class PreferencesMapTest {