From 2a4af5a995cb8ae7214d2044a3d962e8bde138e8 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 24 Jul 2014 11:31:24 +0000 Subject: [PATCH] * Organize Imports --- source/net/filebot/archive/Archive.java | 8 ++++---- source/net/filebot/media/ReleaseInfo.java | 2 +- source/net/filebot/ui/AbstractSearchPanel.java | 2 +- source/net/filebot/ui/FileBotTabComponent.java | 2 +- source/net/filebot/ui/HistoryPanel.java | 2 +- source/net/filebot/ui/LanguageComboBoxModel.java | 1 - source/net/filebot/ui/MainFrame.java | 4 ++-- source/net/filebot/ui/SelectButtonTextField.java | 2 +- source/net/filebot/ui/SelectDialog.java | 2 +- source/net/filebot/ui/SinglePanelFrame.java | 2 +- source/net/filebot/ui/rename/HistoryDialog.java | 2 +- source/net/filebot/ui/rename/RenameList.java | 2 +- source/net/filebot/ui/rename/ValidateDialog.java | 2 +- source/net/filebot/ui/sfv/SfvPanel.java | 2 +- .../net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java | 2 +- .../filebot/ui/subtitle/SubtitleDownloadComponent.java | 2 +- source/net/filebot/ui/subtitle/SubtitleFileChooser.java | 2 +- .../filebot/ui/subtitle/SubtitlePackageCellRenderer.java | 2 +- source/net/filebot/ui/subtitle/SubtitlePanel.java | 2 +- source/net/filebot/ui/subtitle/SubtitleViewer.java | 2 +- source/net/filebot/web/FanartTVClient.java | 2 +- test/net/filebot/similarity/EpisodeMetricsTest.java | 2 +- test/net/filebot/web/TheTVDBClientTest.java | 2 +- website/data/release-groups.txt | 2 +- 24 files changed, 27 insertions(+), 28 deletions(-) diff --git a/source/net/filebot/archive/Archive.java b/source/net/filebot/archive/Archive.java index 7bb95890..9d60d737 100644 --- a/source/net/filebot/archive/Archive.java +++ b/source/net/filebot/archive/Archive.java @@ -16,14 +16,14 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sf.sevenzipjbinding.ArchiveFormat; -import net.sf.sevenzipjbinding.ISevenZipInArchive; -import net.sf.sevenzipjbinding.PropID; -import net.sf.sevenzipjbinding.SevenZipException; import net.filebot.MediaTypes; import net.filebot.util.FileUtilities.ExtensionFileFilter; import net.filebot.vfs.FileInfo; import net.filebot.vfs.SimpleFileInfo; +import net.sf.sevenzipjbinding.ArchiveFormat; +import net.sf.sevenzipjbinding.ISevenZipInArchive; +import net.sf.sevenzipjbinding.PropID; +import net.sf.sevenzipjbinding.SevenZipException; public class Archive implements Closeable { diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java index fbd8001b..7f35a718 100644 --- a/source/net/filebot/media/ReleaseInfo.java +++ b/source/net/filebot/media/ReleaseInfo.java @@ -378,7 +378,7 @@ public class ReleaseInfo { int year = parseInt(row[2]); String name = row[3]; String[] aliasNames = copyOfRange(row, 4, row.length); - movies.add(new Movie(name, aliasNames, year, imdbid > 0 ? imdbid : -1, tmdbid > 0 ? tmdbid : -1)); + movies.add(new Movie(name, aliasNames, year, imdbid > 0 ? imdbid : -1, tmdbid > 0 ? tmdbid : -1, null)); } return movies.toArray(new Movie[0]); diff --git a/source/net/filebot/ui/AbstractSearchPanel.java b/source/net/filebot/ui/AbstractSearchPanel.java index 9bf3c04f..a5ddba59 100644 --- a/source/net/filebot/ui/AbstractSearchPanel.java +++ b/source/net/filebot/ui/AbstractSearchPanel.java @@ -31,13 +31,13 @@ import javax.swing.SwingWorker; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.Settings; import net.filebot.util.ExceptionUtilities; import net.filebot.util.ui.LabelProvider; import net.filebot.util.ui.SelectButton; import net.filebot.web.SearchResult; +import net.miginfocom.swing.MigLayout; import ca.odell.glazedlists.BasicEventList; import ca.odell.glazedlists.matchers.TextMatcherEditor; import ca.odell.glazedlists.swing.AutoCompleteSupport; diff --git a/source/net/filebot/ui/FileBotTabComponent.java b/source/net/filebot/ui/FileBotTabComponent.java index 41b6b339..1a4fdb11 100644 --- a/source/net/filebot/ui/FileBotTabComponent.java +++ b/source/net/filebot/ui/FileBotTabComponent.java @@ -11,10 +11,10 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.util.ui.ProgressIndicator; import net.filebot.util.ui.TunedUtilities; +import net.miginfocom.swing.MigLayout; public class FileBotTabComponent extends JComponent { diff --git a/source/net/filebot/ui/HistoryPanel.java b/source/net/filebot/ui/HistoryPanel.java index 23b857f0..61a70d1b 100644 --- a/source/net/filebot/ui/HistoryPanel.java +++ b/source/net/filebot/ui/HistoryPanel.java @@ -14,8 +14,8 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import net.filebot.util.ui.LinkButton; +import net.miginfocom.swing.MigLayout; public class HistoryPanel extends JPanel { diff --git a/source/net/filebot/ui/LanguageComboBoxModel.java b/source/net/filebot/ui/LanguageComboBoxModel.java index 8a02efbd..9f4e3ce6 100644 --- a/source/net/filebot/ui/LanguageComboBoxModel.java +++ b/source/net/filebot/ui/LanguageComboBoxModel.java @@ -5,7 +5,6 @@ import static net.filebot.Language.*; import java.util.AbstractList; import java.util.ArrayList; import java.util.List; -import java.util.Set; import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; diff --git a/source/net/filebot/ui/MainFrame.java b/source/net/filebot/ui/MainFrame.java index b0f436a2..553b9852 100644 --- a/source/net/filebot/ui/MainFrame.java +++ b/source/net/filebot/ui/MainFrame.java @@ -39,8 +39,6 @@ import javax.swing.border.EmptyBorder; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import net.miginfocom.swing.MigLayout; -import net.sf.ehcache.CacheManager; import net.filebot.Analytics; import net.filebot.ResourceManager; import net.filebot.Settings; @@ -55,6 +53,8 @@ import net.filebot.util.PreferencesMap.PreferencesEntry; import net.filebot.util.ui.DefaultFancyListCellRenderer; import net.filebot.util.ui.ShadowBorder; import net.filebot.util.ui.TunedUtilities; +import net.miginfocom.swing.MigLayout; +import net.sf.ehcache.CacheManager; public class MainFrame extends JFrame { diff --git a/source/net/filebot/ui/SelectButtonTextField.java b/source/net/filebot/ui/SelectButtonTextField.java index d7d3ae26..c0ee7400 100644 --- a/source/net/filebot/ui/SelectButtonTextField.java +++ b/source/net/filebot/ui/SelectButtonTextField.java @@ -27,10 +27,10 @@ import javax.swing.plaf.basic.BasicComboPopup; import javax.swing.plaf.basic.ComboPopup; import javax.swing.text.JTextComponent; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.util.ui.SelectButton; import net.filebot.util.ui.TunedUtilities; +import net.miginfocom.swing.MigLayout; public class SelectButtonTextField extends JComponent { diff --git a/source/net/filebot/ui/SelectDialog.java b/source/net/filebot/ui/SelectDialog.java index 78d6146a..c3944211 100644 --- a/source/net/filebot/ui/SelectDialog.java +++ b/source/net/filebot/ui/SelectDialog.java @@ -24,10 +24,10 @@ import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.util.ui.DefaultFancyListCellRenderer; import net.filebot.util.ui.TunedUtilities; +import net.miginfocom.swing.MigLayout; public class SelectDialog extends JDialog { diff --git a/source/net/filebot/ui/SinglePanelFrame.java b/source/net/filebot/ui/SinglePanelFrame.java index 93dfc08a..2efb50aa 100644 --- a/source/net/filebot/ui/SinglePanelFrame.java +++ b/source/net/filebot/ui/SinglePanelFrame.java @@ -10,11 +10,11 @@ import java.util.List; import javax.swing.JComponent; import javax.swing.JFrame; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.ui.transfer.TransferablePolicy; import net.filebot.ui.transfer.TransferablePolicy.TransferAction; import net.filebot.util.ExceptionUtilities; +import net.miginfocom.swing.MigLayout; public class SinglePanelFrame extends JFrame { diff --git a/source/net/filebot/ui/rename/HistoryDialog.java b/source/net/filebot/ui/rename/HistoryDialog.java index 2fb2f3e5..4196d676 100644 --- a/source/net/filebot/ui/rename/HistoryDialog.java +++ b/source/net/filebot/ui/rename/HistoryDialog.java @@ -63,7 +63,6 @@ import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; -import net.miginfocom.swing.MigLayout; import net.filebot.History; import net.filebot.History.Element; import net.filebot.History.Sequence; @@ -81,6 +80,7 @@ import net.filebot.util.ui.GradientStyle; import net.filebot.util.ui.LazyDocumentListener; import net.filebot.util.ui.notification.SeparatorBorder; import net.filebot.util.ui.notification.SeparatorBorder.Position; +import net.miginfocom.swing.MigLayout; class HistoryDialog extends JDialog { diff --git a/source/net/filebot/ui/rename/RenameList.java b/source/net/filebot/ui/rename/RenameList.java index 687ddb50..ec3fb128 100644 --- a/source/net/filebot/ui/rename/RenameList.java +++ b/source/net/filebot/ui/rename/RenameList.java @@ -14,11 +14,11 @@ import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.ListSelectionModel; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.ui.FileBotList; import net.filebot.ui.transfer.LoadAction; import net.filebot.ui.transfer.TransferablePolicy; +import net.miginfocom.swing.MigLayout; import ca.odell.glazedlists.EventList; diff --git a/source/net/filebot/ui/rename/ValidateDialog.java b/source/net/filebot/ui/rename/ValidateDialog.java index 20bd43bf..479de1f5 100644 --- a/source/net/filebot/ui/rename/ValidateDialog.java +++ b/source/net/filebot/ui/rename/ValidateDialog.java @@ -34,8 +34,8 @@ import javax.swing.JScrollPane; import javax.swing.KeyStroke; import javax.swing.text.BadLocationException; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; +import net.miginfocom.swing.MigLayout; class ValidateDialog extends JDialog { diff --git a/source/net/filebot/ui/sfv/SfvPanel.java b/source/net/filebot/ui/sfv/SfvPanel.java index bc27f6a1..cf29036e 100644 --- a/source/net/filebot/ui/sfv/SfvPanel.java +++ b/source/net/filebot/ui/sfv/SfvPanel.java @@ -29,7 +29,6 @@ import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.hash.HashType; import net.filebot.ui.SelectDialog; @@ -38,6 +37,7 @@ import net.filebot.ui.transfer.LoadAction; import net.filebot.ui.transfer.SaveAction; import net.filebot.util.FileUtilities; import net.filebot.util.ui.TunedUtilities; +import net.miginfocom.swing.MigLayout; public class SfvPanel extends JComponent { diff --git a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java index 72aa6922..70e9f89b 100644 --- a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java +++ b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java @@ -56,7 +56,6 @@ import javax.swing.border.CompoundBorder; import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; -import net.miginfocom.swing.MigLayout; import net.filebot.Analytics; import net.filebot.ResourceManager; import net.filebot.similarity.EpisodeMetrics; @@ -72,6 +71,7 @@ import net.filebot.vfs.MemoryFile; import net.filebot.web.SubtitleDescriptor; import net.filebot.web.SubtitleProvider; import net.filebot.web.VideoHashSubtitleService; +import net.miginfocom.swing.MigLayout; class SubtitleAutoMatchDialog extends JDialog { diff --git a/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java b/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java index dfa44f24..4ac4c635 100644 --- a/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java +++ b/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java @@ -39,7 +39,6 @@ import javax.swing.ListModel; import javax.swing.SwingUtilities; import javax.swing.border.LineBorder; -import net.miginfocom.swing.MigLayout; import net.filebot.Analytics; import net.filebot.ResourceManager; import net.filebot.subtitle.SubtitleFormat; @@ -49,6 +48,7 @@ import net.filebot.util.ExceptionUtilities; import net.filebot.util.ui.ListView; import net.filebot.util.ui.TunedUtilities; import net.filebot.vfs.MemoryFile; +import net.miginfocom.swing.MigLayout; import ca.odell.glazedlists.BasicEventList; import ca.odell.glazedlists.EventList; import ca.odell.glazedlists.FilterList; diff --git a/source/net/filebot/ui/subtitle/SubtitleFileChooser.java b/source/net/filebot/ui/subtitle/SubtitleFileChooser.java index c283311d..d12c37e6 100644 --- a/source/net/filebot/ui/subtitle/SubtitleFileChooser.java +++ b/source/net/filebot/ui/subtitle/SubtitleFileChooser.java @@ -17,8 +17,8 @@ import javax.swing.JPanel; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; -import net.miginfocom.swing.MigLayout; import net.filebot.subtitle.SubtitleFormat; +import net.miginfocom.swing.MigLayout; public class SubtitleFileChooser extends JFileChooser { diff --git a/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java b/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java index 81188bc1..246c8178 100644 --- a/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java +++ b/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java @@ -10,10 +10,10 @@ import javax.swing.JLabel; import javax.swing.JList; import javax.swing.border.CompoundBorder; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.util.ui.AbstractFancyListCellRenderer; import net.filebot.util.ui.DashedSeparator; +import net.miginfocom.swing.MigLayout; class SubtitlePackageCellRenderer extends AbstractFancyListCellRenderer { diff --git a/source/net/filebot/ui/subtitle/SubtitlePanel.java b/source/net/filebot/ui/subtitle/SubtitlePanel.java index b7235c94..72903d88 100644 --- a/source/net/filebot/ui/subtitle/SubtitlePanel.java +++ b/source/net/filebot/ui/subtitle/SubtitlePanel.java @@ -32,7 +32,6 @@ import javax.swing.JRootPane; import javax.swing.JTextField; import javax.swing.border.TitledBorder; -import net.miginfocom.swing.MigLayout; import net.filebot.Language; import net.filebot.ResourceManager; import net.filebot.Settings; @@ -47,6 +46,7 @@ import net.filebot.web.SearchResult; import net.filebot.web.SubtitleDescriptor; import net.filebot.web.SubtitleProvider; import net.filebot.web.VideoHashSubtitleService; +import net.miginfocom.swing.MigLayout; public class SubtitlePanel extends AbstractSearchPanel { diff --git a/source/net/filebot/ui/subtitle/SubtitleViewer.java b/source/net/filebot/ui/subtitle/SubtitleViewer.java index 8ee590fb..7f2c5695 100644 --- a/source/net/filebot/ui/subtitle/SubtitleViewer.java +++ b/source/net/filebot/ui/subtitle/SubtitleViewer.java @@ -44,13 +44,13 @@ import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; -import net.miginfocom.swing.MigLayout; import net.filebot.ResourceManager; import net.filebot.subtitle.SubtitleElement; import net.filebot.util.ui.GradientStyle; import net.filebot.util.ui.LazyDocumentListener; import net.filebot.util.ui.notification.SeparatorBorder; import net.filebot.util.ui.notification.SeparatorBorder.Position; +import net.miginfocom.swing.MigLayout; public class SubtitleViewer extends JFrame { diff --git a/source/net/filebot/web/FanartTVClient.java b/source/net/filebot/web/FanartTVClient.java index b7104380..7a54c838 100644 --- a/source/net/filebot/web/FanartTVClient.java +++ b/source/net/filebot/web/FanartTVClient.java @@ -16,9 +16,9 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import net.filebot.web.FanartTVClient.FanartDescriptor.FanartProperty; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; -import net.filebot.web.FanartTVClient.FanartDescriptor.FanartProperty; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/test/net/filebot/similarity/EpisodeMetricsTest.java b/test/net/filebot/similarity/EpisodeMetricsTest.java index 94d81218..a51b0734 100644 --- a/test/net/filebot/similarity/EpisodeMetricsTest.java +++ b/test/net/filebot/similarity/EpisodeMetricsTest.java @@ -7,8 +7,8 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import net.filebot.web.SimpleDate; import net.filebot.web.Episode; +import net.filebot.web.SimpleDate; import net.filebot.web.TheTVDBSearchResult; import org.junit.Test; diff --git a/test/net/filebot/web/TheTVDBClientTest.java b/test/net/filebot/web/TheTVDBClientTest.java index 01033aed..5de33330 100644 --- a/test/net/filebot/web/TheTVDBClientTest.java +++ b/test/net/filebot/web/TheTVDBClientTest.java @@ -10,10 +10,10 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import net.sf.ehcache.CacheManager; import net.filebot.web.TheTVDBClient.BannerDescriptor; import net.filebot.web.TheTVDBClient.MirrorType; import net.filebot.web.TheTVDBClient.SeriesInfo; +import net.sf.ehcache.CacheManager; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt index 0debc442..2e96f89b 100644 --- a/website/data/release-groups.txt +++ b/website/data/release-groups.txt @@ -1679,7 +1679,7 @@ NnH No.TK.BKF NO1KNOWS NODLABS -NoGrp +NOGRP NOHD NOiR NoneStop