From 6fc7141fdb8fd0d11880a4148ec33137b35d9b68 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sat, 19 Apr 2014 06:30:29 +0000 Subject: [PATCH] * fix package and import declarations --- source/net/filebot/Analytics.java | 4 +- source/net/filebot/Cache.java | 2 +- source/net/filebot/History.java | 2 +- source/net/filebot/HistorySpooler.java | 6 +- source/net/filebot/Language.java | 2 +- source/net/filebot/Main.java | 36 +++---- source/net/filebot/MediaTypes.java | 6 +- source/net/filebot/MetaAttributeView.java | 2 +- source/net/filebot/NativeRenameAction.java | 4 +- source/net/filebot/RenameAction.java | 2 +- source/net/filebot/ResourceManager.java | 2 +- source/net/filebot/Settings.java | 16 +-- source/net/filebot/StandardRenameAction.java | 4 +- source/net/filebot/WebServices.java | 50 ++++----- source/net/filebot/archive/Archive.java | 10 +- .../archive/ArchiveOpenVolumeCallback.java | 2 +- .../net/filebot/archive/ExtractCallback.java | 2 +- .../filebot/archive/ExtractOutProvider.java | 2 +- .../net/filebot/archive/ExtractOutStream.java | 2 +- source/net/filebot/archive/FileMapper.java | 2 +- .../net/filebot/archive/SevenZipLoader.java | 2 +- .../archive/VolumedArchiveInStream.java | 2 +- source/net/filebot/cli/ArgumentBean.java | 6 +- source/net/filebot/cli/ArgumentProcessor.java | 20 ++-- source/net/filebot/cli/BindingsHandler.java | 2 +- source/net/filebot/cli/CLILogging.java | 4 +- source/net/filebot/cli/CmdlineInterface.java | 4 +- source/net/filebot/cli/CmdlineOperations.java | 102 +++++++++--------- source/net/filebot/cli/ConflictAction.java | 2 +- .../net/filebot/cli/FolderWatchService.java | 8 +- source/net/filebot/cli/GroovyPad.java | 14 +-- source/net/filebot/cli/ScriptShell.java | 2 +- .../net/filebot/cli/ScriptShellBaseClass.java | 30 +++--- .../net/filebot/cli/ScriptShellMethods.java | 22 ++-- .../format/AssociativeScriptObject.java | 2 +- .../net/filebot/format/BindingException.java | 2 +- source/net/filebot/format/Define.java | 2 +- .../filebot/format/ExpressionBindings.java | 4 +- .../filebot/format/ExpressionException.java | 2 +- .../net/filebot/format/ExpressionFilter.java | 2 +- .../net/filebot/format/ExpressionFormat.java | 6 +- .../format/ExpressionFormatFunctions.java | 2 +- .../format/ExpressionFormatMethods.java | 4 +- .../net/filebot/format/MediaBindingBean.java | 64 +++++------ .../filebot/format/PrivilegedInvocation.java | 2 +- .../net/filebot/format/PropertyBindings.java | 2 +- .../filebot/format/SecureCompiledScript.java | 4 +- source/net/filebot/gio/GIOLibrary.java | 2 +- source/net/filebot/gio/GVFS.java | 2 +- source/net/filebot/hash/ChecksumHash.java | 2 +- source/net/filebot/hash/Ed2kHash.java | 2 +- source/net/filebot/hash/Hash.java | 2 +- source/net/filebot/hash/HashType.java | 6 +- .../net/filebot/hash/MessageDigestHash.java | 2 +- source/net/filebot/hash/SfvFormat.java | 2 +- .../filebot/hash/VerificationFileReader.java | 2 +- .../filebot/hash/VerificationFileWriter.java | 4 +- .../net/filebot/hash/VerificationFormat.java | 2 +- .../filebot/hash/VerificationUtilities.java | 4 +- source/net/filebot/media/MediaDetection.java | 62 +++++------ source/net/filebot/media/MetaAttributes.java | 4 +- source/net/filebot/media/ReleaseInfo.java | 20 ++-- .../media/SmartSeasonEpisodeMatcher.java | 4 +- .../mediainfo/MediaDurationFilter.java | 4 +- source/net/filebot/mediainfo/MediaInfo.java | 2 +- .../filebot/mediainfo/MediaInfoException.java | 2 +- .../filebot/mediainfo/MediaInfoLibrary.java | 2 +- .../similarity/CommonSequenceMatcher.java | 2 +- .../similarity/CrossPropertyMetric.java | 4 +- .../net/filebot/similarity/DateMatcher.java | 4 +- source/net/filebot/similarity/DateMetric.java | 4 +- .../filebot/similarity/EpisodeMatcher.java | 8 +- .../filebot/similarity/EpisodeMetrics.java | 34 +++--- .../filebot/similarity/FileNameMetric.java | 4 +- .../filebot/similarity/FileSizeMetric.java | 2 +- source/net/filebot/similarity/Match.java | 2 +- source/net/filebot/similarity/Matcher.java | 2 +- source/net/filebot/similarity/MetricAvg.java | 2 +- .../net/filebot/similarity/MetricCascade.java | 2 +- source/net/filebot/similarity/MetricMin.java | 2 +- .../similarity/NameSimilarityMetric.java | 4 +- .../net/filebot/similarity/Normalization.java | 2 +- .../similarity/NumericSimilarityMetric.java | 2 +- .../similarity/SeasonEpisodeMatcher.java | 4 +- .../similarity/SeasonEpisodeMetric.java | 4 +- .../similarity/SequenceMatchSimilarity.java | 6 +- .../filebot/similarity/SeriesNameMatcher.java | 12 +-- .../similarity/SimilarityComparator.java | 2 +- .../filebot/similarity/SimilarityMetric.java | 2 +- .../similarity/StrictEpisodeMetrics.java | 2 +- .../similarity/StringEqualsMetric.java | 2 +- .../filebot/similarity/SubstringMetric.java | 4 +- .../filebot/similarity/TimeStampMetric.java | 2 +- .../net/filebot/subtitle/MicroDVDReader.java | 4 +- source/net/filebot/subtitle/SubRipReader.java | 4 +- source/net/filebot/subtitle/SubRipWriter.java | 2 +- .../subtitle/SubStationAlphaReader.java | 2 +- .../net/filebot/subtitle/SubViewerReader.java | 4 +- .../net/filebot/subtitle/SubtitleElement.java | 2 +- .../net/filebot/subtitle/SubtitleFormat.java | 6 +- .../net/filebot/subtitle/SubtitleNaming.java | 6 +- .../net/filebot/subtitle/SubtitleReader.java | 2 +- .../filebot/subtitle/SubtitleTimeFormat.java | 2 +- .../filebot/subtitle/SubtitleUtilities.java | 42 ++++---- source/net/filebot/torrent/BDecoder.java | 2 +- source/net/filebot/torrent/Torrent.java | 2 +- .../net/filebot/ui/AbstractSearchPanel.java | 18 ++-- source/net/filebot/ui/FileBotList.java | 12 +-- .../filebot/ui/FileBotListExportHandler.java | 4 +- source/net/filebot/ui/FileBotTab.java | 2 +- .../net/filebot/ui/FileBotTabComponent.java | 8 +- source/net/filebot/ui/HeaderPanel.java | 10 +- source/net/filebot/ui/HistoryPanel.java | 4 +- source/net/filebot/ui/LanguageComboBox.java | 8 +- .../ui/LanguageComboBoxCellRenderer.java | 8 +- .../net/filebot/ui/LanguageComboBoxModel.java | 6 +- source/net/filebot/ui/MainFrame.java | 32 +++--- .../net/filebot/ui/NotificationLogging.java | 18 ++-- source/net/filebot/ui/PanelBuilder.java | 2 +- .../net/filebot/ui/SelectButtonTextField.java | 8 +- source/net/filebot/ui/SelectDialog.java | 10 +- source/net/filebot/ui/SinglePanelFrame.java | 10 +- .../net/filebot/ui/analyze/AnalyzePanel.java | 2 +- .../ui/analyze/AnalyzePanelBuilder.java | 6 +- .../net/filebot/ui/analyze/AttributeTool.java | 16 +-- .../net/filebot/ui/analyze/ExtractTool.java | 34 +++--- source/net/filebot/ui/analyze/FileTree.java | 12 +-- .../ui/analyze/FileTreeCellRenderer.java | 8 +- .../ui/analyze/FileTreeExportHandler.java | 10 +- .../net/filebot/ui/analyze/FileTreePanel.java | 14 +-- .../analyze/FileTreeTransferablePolicy.java | 18 ++-- source/net/filebot/ui/analyze/SplitTool.java | 14 +-- source/net/filebot/ui/analyze/Tool.java | 12 +-- source/net/filebot/ui/analyze/TypeTool.java | 10 +- .../ui/episodelist/EpisodeListPanel.java | 58 +++++----- .../episodelist/EpisodeListPanelBuilder.java | 6 +- .../ui/episodelist/SeasonSpinnerEditor.java | 4 +- .../ui/episodelist/SeasonSpinnerModel.java | 2 +- .../ui/list/FileListTransferablePolicy.java | 14 +-- source/net/filebot/ui/list/ListPanel.java | 20 ++-- .../net/filebot/ui/list/ListPanelBuilder.java | 6 +- .../ui/rename/AudioFingerprintMatcher.java | 16 +-- .../ui/rename/AutoCompleteMatcher.java | 6 +- .../net/filebot/ui/rename/BindingDialog.java | 30 +++--- .../ui/rename/CharacterHighlightPainter.java | 4 +- .../filebot/ui/rename/EpisodeListMatcher.java | 34 +++--- .../ui/rename/ExpressionFormatter.java | 8 +- .../filebot/ui/rename/FileNameFormatter.java | 8 +- .../rename/FilesListTransferablePolicy.java | 14 +-- .../net/filebot/ui/rename/FormatDialog.java | 46 ++++---- .../ui/rename/HighlightListCellRenderer.java | 6 +- .../net/filebot/ui/rename/HistoryDialog.java | 34 +++--- source/net/filebot/ui/rename/MatchAction.java | 20 ++-- .../net/filebot/ui/rename/MatchFormatter.java | 4 +- source/net/filebot/ui/rename/MatchModel.java | 4 +- .../net/filebot/ui/rename/MovieFormatter.java | 8 +- .../filebot/ui/rename/MovieHashMatcher.java | 40 +++---- .../rename/NamesListTransferablePolicy.java | 26 ++--- .../net/filebot/ui/rename/RenameAction.java | 36 +++---- source/net/filebot/ui/rename/RenameList.java | 10 +- .../ui/rename/RenameListCellRenderer.java | 28 ++--- source/net/filebot/ui/rename/RenameModel.java | 10 +- source/net/filebot/ui/rename/RenamePanel.java | 58 +++++----- .../filebot/ui/rename/RenamePanelBuilder.java | 6 +- .../ui/rename/ScrollPaneSynchronizer.java | 2 +- .../net/filebot/ui/rename/ValidateDialog.java | 10 +- source/net/filebot/ui/sfv/ChecksumButton.java | 4 +- source/net/filebot/ui/sfv/ChecksumCell.java | 6 +- .../filebot/ui/sfv/ChecksumCellRenderer.java | 6 +- .../ui/sfv/ChecksumComputationService.java | 4 +- .../ui/sfv/ChecksumComputationTask.java | 6 +- source/net/filebot/ui/sfv/ChecksumRow.java | 6 +- source/net/filebot/ui/sfv/ChecksumTable.java | 6 +- .../ui/sfv/ChecksumTableExportHandler.java | 10 +- .../filebot/ui/sfv/ChecksumTableModel.java | 8 +- .../sfv/ChecksumTableTransferablePolicy.java | 18 ++-- .../ui/sfv/HighlightPatternCellRenderer.java | 4 +- source/net/filebot/ui/sfv/SfvPanel.java | 22 ++-- .../net/filebot/ui/sfv/SfvPanelBuilder.java | 6 +- .../filebot/ui/sfv/StateIconCellRenderer.java | 6 +- .../ui/sfv/SwingWorkerCellRenderer.java | 2 +- .../filebot/ui/sfv/TotalProgressPanel.java | 2 +- .../subtitle/MemoryFileListExportHandler.java | 10 +- .../filebot/ui/subtitle/SimpleComboBox.java | 4 +- .../ui/subtitle/SubtitleAutoMatchDialog.java | 38 +++---- .../subtitle/SubtitleDownloadComponent.java | 30 +++--- .../ui/subtitle/SubtitleDropTarget.java | 26 ++--- .../ui/subtitle/SubtitleFileChooser.java | 4 +- .../filebot/ui/subtitle/SubtitlePackage.java | 16 +-- .../subtitle/SubtitlePackageCellRenderer.java | 8 +- .../filebot/ui/subtitle/SubtitlePanel.java | 38 +++---- .../ui/subtitle/SubtitlePanelBuilder.java | 6 +- .../ui/subtitle/SubtitleUploadDialog.java | 40 +++---- .../filebot/ui/subtitle/SubtitleViewer.java | 16 +-- .../ui/transfer/ArrayTransferable.java | 2 +- .../BackgroundFileTransferablePolicy.java | 4 +- .../ui/transfer/ByteBufferTransferable.java | 8 +- .../filebot/ui/transfer/ClipboardHandler.java | 2 +- .../ui/transfer/CompositeTranserable.java | 2 +- .../ui/transfer/DefaultClipboardHandler.java | 2 +- .../ui/transfer/DefaultTransferHandler.java | 2 +- .../ui/transfer/FileExportHandler.java | 2 +- .../filebot/ui/transfer/FileTransferable.java | 6 +- .../ui/transfer/FileTransferablePolicy.java | 6 +- .../net/filebot/ui/transfer/LoadAction.java | 10 +- .../net/filebot/ui/transfer/SaveAction.java | 8 +- .../ui/transfer/TextFileExportHandler.java | 2 +- .../ui/transfer/TextFileTransferable.java | 2 +- .../transfer/TransferableExportHandler.java | 2 +- .../ui/transfer/TransferablePolicy.java | 2 +- .../TransferablePolicyFileFilter.java | 2 +- .../filebot/util/ByteBufferInputStream.java | 2 +- .../filebot/util/ByteBufferOutputStream.java | 2 +- .../filebot/util/DefaultThreadFactory.java | 2 +- source/net/filebot/util/DownloadTask.java | 4 +- .../net/filebot/util/ExceptionUtilities.java | 2 +- source/net/filebot/util/FastFile.java | 2 +- source/net/filebot/util/FileUtilities.java | 2 +- source/net/filebot/util/FilterIterator.java | 2 +- .../filebot/util/ListChangeSynchronizer.java | 2 +- source/net/filebot/util/PreferencesList.java | 4 +- source/net/filebot/util/PreferencesMap.java | 2 +- source/net/filebot/util/StringUtilities.java | 2 +- source/net/filebot/util/TeePrintStream.java | 2 +- source/net/filebot/util/TemporaryFolder.java | 2 +- source/net/filebot/util/Timer.java | 2 +- source/net/filebot/util/TreeIterator.java | 2 +- source/net/filebot/util/XPathUtilities.java | 2 +- .../filebot/util/prefs/FilePreferences.java | 2 +- .../util/prefs/FilePreferencesFactory.java | 8 +- source/net/filebot/util/ui/AbstractBean.java | 2 +- .../ui/AbstractFancyListCellRenderer.java | 2 +- source/net/filebot/util/ui/ActionPopup.java | 2 +- .../filebot/util/ui/ColorTintImageFilter.java | 2 +- .../net/filebot/util/ui/DashedSeparator.java | 2 +- .../util/ui/DefaultFancyListCellRenderer.java | 2 +- .../filebot/util/ui/EmptySelectionModel.java | 2 +- .../util/ui/FancyTreeCellRenderer.java | 2 +- source/net/filebot/util/ui/GradientStyle.java | 2 +- source/net/filebot/util/ui/LabelProvider.java | 2 +- .../filebot/util/ui/LazyDocumentListener.java | 2 +- source/net/filebot/util/ui/LinkButton.java | 2 +- source/net/filebot/util/ui/ListView.java | 2 +- .../filebot/util/ui/LoadingOverlayPane.java | 2 +- .../filebot/util/ui/NullLabelProvider.java | 2 +- .../net/filebot/util/ui/ProgressDialog.java | 2 +- .../filebot/util/ui/ProgressIndicator.java | 2 +- source/net/filebot/util/ui/RoundBorder.java | 2 +- source/net/filebot/util/ui/SelectButton.java | 2 +- source/net/filebot/util/ui/ShadowBorder.java | 2 +- .../filebot/util/ui/SimpleLabelProvider.java | 4 +- .../ui/SwingWorkerPropertyChangeAdapter.java | 2 +- .../net/filebot/util/ui/TunedUtilities.java | 2 +- .../util/ui/notification/Direction.java | 2 +- .../ui/notification/MessageNotification.java | 2 +- .../ui/notification/NotificationLayout.java | 2 +- .../ui/notification/NotificationManager.java | 4 +- .../ui/notification/NotificationWindow.java | 4 +- .../notification/QueueNotificationLayout.java | 4 +- .../util/ui/notification/SeparatorBorder.java | 4 +- .../SimpleNotificationLayout.java | 4 +- source/net/filebot/vfs/ArchiveType.java | 2 +- source/net/filebot/vfs/FileInfo.java | 2 +- source/net/filebot/vfs/MemoryFile.java | 2 +- source/net/filebot/vfs/RarArchive.java | 4 +- source/net/filebot/vfs/SimpleFileInfo.java | 4 +- source/net/filebot/vfs/ZipArchive.java | 6 +- .../filebot/web/AbstractCachedResource.java | 2 +- .../web/AbstractEpisodeListProvider.java | 6 +- source/net/filebot/web/AcoustIDClient.java | 12 +-- source/net/filebot/web/AnidbClient.java | 12 +-- source/net/filebot/web/AnidbSearchResult.java | 2 +- source/net/filebot/web/AudioTrack.java | 2 +- source/net/filebot/web/AudioTrackFormat.java | 2 +- source/net/filebot/web/CachedPage.java | 6 +- source/net/filebot/web/CachedResource.java | 2 +- source/net/filebot/web/CachedXmlResource.java | 2 +- .../net/filebot/web/ETagCachedResource.java | 2 +- source/net/filebot/web/Episode.java | 2 +- source/net/filebot/web/EpisodeFormat.java | 4 +- .../net/filebot/web/EpisodeListProvider.java | 2 +- source/net/filebot/web/EpisodeUtilities.java | 2 +- source/net/filebot/web/FanartTVClient.java | 8 +- source/net/filebot/web/FloodLimit.java | 2 +- source/net/filebot/web/HyperLink.java | 2 +- source/net/filebot/web/ID3Lookup.java | 8 +- source/net/filebot/web/IMDbClient.java | 16 +-- source/net/filebot/web/LocalSearch.java | 4 +- source/net/filebot/web/Movie.java | 2 +- source/net/filebot/web/MovieFormat.java | 2 +- .../web/MovieIdentificationService.java | 2 +- source/net/filebot/web/MoviePart.java | 2 +- source/net/filebot/web/MultiEpisode.java | 2 +- .../web/MusicIdentificationService.java | 2 +- .../net/filebot/web/OpenSubtitlesClient.java | 28 ++--- .../net/filebot/web/OpenSubtitlesHasher.java | 2 +- .../web/OpenSubtitlesSubtitleDescriptor.java | 6 +- .../net/filebot/web/OpenSubtitlesXmlRpc.java | 8 +- source/net/filebot/web/SearchResult.java | 2 +- .../web/SeasonOutOfBoundsException.java | 2 +- .../net/filebot/web/SerienjunkiesClient.java | 10 +- .../web/SerienjunkiesSearchResult.java | 2 +- source/net/filebot/web/SimpleDate.java | 2 +- source/net/filebot/web/SortOrder.java | 2 +- .../net/filebot/web/SubtitleDescriptor.java | 4 +- source/net/filebot/web/SubtitleProvider.java | 2 +- source/net/filebot/web/TMDbClient.java | 10 +- source/net/filebot/web/TVRageClient.java | 12 +-- .../net/filebot/web/TVRageSearchResult.java | 2 +- source/net/filebot/web/TheTVDBClient.java | 18 ++-- .../net/filebot/web/TheTVDBSearchResult.java | 2 +- .../filebot/web/VideoHashSubtitleService.java | 2 +- source/net/filebot/web/WebRequest.java | 4 +- test/net/filebot/AllTests.java | 20 ++-- .../filebot/format/ExpressionFormatTest.java | 2 +- .../filebot/hash/VerificationFormatTest.java | 2 +- test/net/filebot/media/ReleaseInfoTest.java | 2 +- .../filebot/similarity/DateMetricTest.java | 2 +- .../similarity/EpisodeMetricsTest.java | 10 +- .../similarity/NameSimilarityMetricTest.java | 2 +- .../NumericSimilarityMetricTest.java | 4 +- .../similarity/SeasonEpisodeMatcherTest.java | 8 +- .../similarity/SeasonEpisodeMetricTest.java | 2 +- .../similarity/SeriesNameMatcherTest.java | 4 +- .../similarity/SimilarityTestSuite.java | 2 +- .../filebot/subtitle/MicroDVDReaderTest.java | 2 +- .../filebot/subtitle/SubRipReaderTest.java | 2 +- .../subtitle/SubtitleReaderTestSuite.java | 2 +- .../net/filebot/ui/rename/MatchModelTest.java | 4 +- .../util/ByteBufferOutputStreamTest.java | 2 +- test/net/filebot/util/FileUtilitiesTest.java | 2 +- test/net/filebot/util/FilterIteratorTest.java | 2 +- .../net/filebot/util/PreferencesListTest.java | 4 +- test/net/filebot/util/PreferencesMapTest.java | 6 +- test/net/filebot/util/TestUtil.java | 2 +- test/net/filebot/util/TreeIteratorTest.java | 2 +- test/net/filebot/util/UtilTestSuite.java | 2 +- test/net/filebot/web/AnidbClientTest.java | 2 +- test/net/filebot/web/IMDbClientTest.java | 4 +- .../filebot/web/OpenSubtitlesHasherTest.java | 2 +- .../filebot/web/OpenSubtitlesXmlRpcTest.java | 12 +-- .../filebot/web/SerienjunkiesClientTest.java | 2 +- test/net/filebot/web/TMDbClientTest.java | 8 +- test/net/filebot/web/TVRageClientTest.java | 2 +- test/net/filebot/web/TheTVDBClientTest.java | 8 +- test/net/filebot/web/WebTestSuite.java | 2 +- 346 files changed, 1313 insertions(+), 1313 deletions(-) diff --git a/source/net/filebot/Analytics.java b/source/net/filebot/Analytics.java index 5ef6d372..5d2cbd53 100644 --- a/source/net/filebot/Analytics.java +++ b/source/net/filebot/Analytics.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot; +package net.filebot; import static com.dmurph.tracking.JGoogleAnalyticsTracker.GoogleAnalyticsVersion.*; -import static net.sourceforge.filebot.Settings.*; +import static net.filebot.Settings.*; import java.awt.DisplayMode; import java.awt.GraphicsDevice; diff --git a/source/net/filebot/Cache.java b/source/net/filebot/Cache.java index 57961952..8f985431 100644 --- a/source/net/filebot/Cache.java +++ b/source/net/filebot/Cache.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot; +package net.filebot; import java.io.Serializable; import java.util.Arrays; diff --git a/source/net/filebot/History.java b/source/net/filebot/History.java index c45da96b..2d2c573d 100644 --- a/source/net/filebot/History.java +++ b/source/net/filebot/History.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot; +package net.filebot; import static java.util.Collections.*; diff --git a/source/net/filebot/HistorySpooler.java b/source/net/filebot/HistorySpooler.java index 876ef9ec..02cbd4d7 100644 --- a/source/net/filebot/HistorySpooler.java +++ b/source/net/filebot/HistorySpooler.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot; +package net.filebot; -import static net.sourceforge.filebot.Settings.*; +import static net.filebot.Settings.*; import java.io.File; import java.io.IOException; @@ -14,7 +14,7 @@ import java.util.Map.Entry; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.History.Element; +import net.filebot.History.Element; import org.apache.commons.io.input.CloseShieldInputStream; import org.apache.commons.io.output.CloseShieldOutputStream; diff --git a/source/net/filebot/Language.java b/source/net/filebot/Language.java index db313655..95c23553 100644 --- a/source/net/filebot/Language.java +++ b/source/net/filebot/Language.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot; +package net.filebot; import static java.util.Arrays.*; import static java.util.Collections.*; diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java index 36ac6208..e938568d 100644 --- a/source/net/filebot/Main.java +++ b/source/net/filebot/Main.java @@ -1,12 +1,12 @@ -//TODO MOVE package net.sourceforge.filebot to net.filebot -package net.sourceforge.filebot; +//TODO MOVE package net.filebot to net.filebot +package net.filebot; import static java.awt.GraphicsEnvironment.*; import static java.util.regex.Pattern.*; import static javax.swing.JOptionPane.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Desktop; import java.awt.Dialog.ModalityType; @@ -50,19 +50,19 @@ import javax.xml.parsers.DocumentBuilderFactory; import net.miginfocom.swing.MigLayout; import net.sf.ehcache.CacheManager; -import net.sourceforge.filebot.cli.ArgumentBean; -import net.sourceforge.filebot.cli.ArgumentProcessor; -import net.sourceforge.filebot.cli.CmdlineOperations; -import net.sourceforge.filebot.format.ExpressionFormat; -import net.sourceforge.filebot.gio.GVFS; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.ui.MainFrame; -import net.sourceforge.filebot.ui.PanelBuilder; -import net.sourceforge.filebot.ui.SinglePanelFrame; -import net.sourceforge.filebot.util.ByteBufferInputStream; -import net.sourceforge.filebot.util.PreferencesMap.PreferencesEntry; -import net.sourceforge.filebot.util.TeePrintStream; -import net.sourceforge.filebot.web.CachedResource; +import net.filebot.cli.ArgumentBean; +import net.filebot.cli.ArgumentProcessor; +import net.filebot.cli.CmdlineOperations; +import net.filebot.format.ExpressionFormat; +import net.filebot.gio.GVFS; +import net.filebot.media.MediaDetection; +import net.filebot.ui.MainFrame; +import net.filebot.ui.PanelBuilder; +import net.filebot.ui.SinglePanelFrame; +import net.filebot.util.ByteBufferInputStream; +import net.filebot.util.PreferencesMap.PreferencesEntry; +import net.filebot.util.TeePrintStream; +import net.filebot.web.CachedResource; import org.w3c.dom.NodeList; diff --git a/source/net/filebot/MediaTypes.java b/source/net/filebot/MediaTypes.java index c1bfff72..77a815d6 100644 --- a/source/net/filebot/MediaTypes.java +++ b/source/net/filebot/MediaTypes.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot; +package net.filebot; import static java.util.Collections.*; -import static net.sourceforge.filebot.util.XPathUtilities.*; +import static net.filebot.util.XPathUtilities.*; import java.util.ArrayList; import java.util.HashMap; @@ -11,7 +11,7 @@ import java.util.Map.Entry; import javax.xml.parsers.DocumentBuilderFactory; -import net.sourceforge.filebot.util.FileUtilities.ExtensionFileFilter; +import net.filebot.util.FileUtilities.ExtensionFileFilter; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/source/net/filebot/MetaAttributeView.java b/source/net/filebot/MetaAttributeView.java index 414c14a7..74dbb4ef 100644 --- a/source/net/filebot/MetaAttributeView.java +++ b/source/net/filebot/MetaAttributeView.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot; +package net.filebot; import static java.nio.file.Files.*; diff --git a/source/net/filebot/NativeRenameAction.java b/source/net/filebot/NativeRenameAction.java index 8d53c1da..c3709aff 100644 --- a/source/net/filebot/NativeRenameAction.java +++ b/source/net/filebot/NativeRenameAction.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot; +package net.filebot; import static java.util.Collections.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.IOException; diff --git a/source/net/filebot/RenameAction.java b/source/net/filebot/RenameAction.java index 75589ac5..b169e0c3 100644 --- a/source/net/filebot/RenameAction.java +++ b/source/net/filebot/RenameAction.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot; +package net.filebot; import java.io.File; diff --git a/source/net/filebot/ResourceManager.java b/source/net/filebot/ResourceManager.java index 2fe9bb3d..433064c9 100644 --- a/source/net/filebot/ResourceManager.java +++ b/source/net/filebot/ResourceManager.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot; +package net.filebot; import java.awt.Image; diff --git a/source/net/filebot/Settings.java b/source/net/filebot/Settings.java index 6d515049..ff6a8b5f 100644 --- a/source/net/filebot/Settings.java +++ b/source/net/filebot/Settings.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot; +package net.filebot; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.awt.GraphicsEnvironment; import java.io.File; @@ -9,12 +9,12 @@ import java.util.ResourceBundle; import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; -import net.sourceforge.filebot.cli.ArgumentBean; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.PreferencesList; -import net.sourceforge.filebot.util.PreferencesMap; -import net.sourceforge.filebot.util.PreferencesMap.PreferencesEntry; -import net.sourceforge.filebot.util.PreferencesMap.StringAdapter; +import net.filebot.cli.ArgumentBean; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.PreferencesList; +import net.filebot.util.PreferencesMap; +import net.filebot.util.PreferencesMap.PreferencesEntry; +import net.filebot.util.PreferencesMap.StringAdapter; public final class Settings { diff --git a/source/net/filebot/StandardRenameAction.java b/source/net/filebot/StandardRenameAction.java index b3d116c7..296b55a8 100644 --- a/source/net/filebot/StandardRenameAction.java +++ b/source/net/filebot/StandardRenameAction.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot; +package net.filebot; import java.io.File; import java.io.IOException; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.util.FileUtilities; public enum StandardRenameAction implements RenameAction { diff --git a/source/net/filebot/WebServices.java b/source/net/filebot/WebServices.java index 7b984fc9..8b48f27e 100644 --- a/source/net/filebot/WebServices.java +++ b/source/net/filebot/WebServices.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot; +package net.filebot; import static java.util.Arrays.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.media.MediaDetection.*; +import static net.filebot.Settings.*; +import static net.filebot.media.MediaDetection.*; import java.io.IOException; import java.util.LinkedHashSet; @@ -18,28 +18,28 @@ import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.web.AcoustIDClient; -import net.sourceforge.filebot.web.AnidbClient; -import net.sourceforge.filebot.web.AnidbSearchResult; -import net.sourceforge.filebot.web.AudioTrack; -import net.sourceforge.filebot.web.EpisodeListProvider; -import net.sourceforge.filebot.web.FanartTVClient; -import net.sourceforge.filebot.web.ID3Lookup; -import net.sourceforge.filebot.web.IMDbClient; -import net.sourceforge.filebot.web.LocalSearch; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.MovieIdentificationService; -import net.sourceforge.filebot.web.MusicIdentificationService; -import net.sourceforge.filebot.web.OpenSubtitlesClient; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.SerienjunkiesClient; -import net.sourceforge.filebot.web.SubtitleProvider; -import net.sourceforge.filebot.web.TMDbClient; -import net.sourceforge.filebot.web.TVRageClient; -import net.sourceforge.filebot.web.TVRageSearchResult; -import net.sourceforge.filebot.web.TheTVDBClient; -import net.sourceforge.filebot.web.TheTVDBSearchResult; -import net.sourceforge.filebot.web.VideoHashSubtitleService; +import net.filebot.web.AcoustIDClient; +import net.filebot.web.AnidbClient; +import net.filebot.web.AnidbSearchResult; +import net.filebot.web.AudioTrack; +import net.filebot.web.EpisodeListProvider; +import net.filebot.web.FanartTVClient; +import net.filebot.web.ID3Lookup; +import net.filebot.web.IMDbClient; +import net.filebot.web.LocalSearch; +import net.filebot.web.Movie; +import net.filebot.web.MovieIdentificationService; +import net.filebot.web.MusicIdentificationService; +import net.filebot.web.OpenSubtitlesClient; +import net.filebot.web.SearchResult; +import net.filebot.web.SerienjunkiesClient; +import net.filebot.web.SubtitleProvider; +import net.filebot.web.TMDbClient; +import net.filebot.web.TVRageClient; +import net.filebot.web.TVRageSearchResult; +import net.filebot.web.TheTVDBClient; +import net.filebot.web.TheTVDBSearchResult; +import net.filebot.web.VideoHashSubtitleService; /** * Reuse the same web service client so login, cache, etc. can be shared. diff --git a/source/net/filebot/archive/Archive.java b/source/net/filebot/archive/Archive.java index 10b90197..7bb95890 100644 --- a/source/net/filebot/archive/Archive.java +++ b/source/net/filebot/archive/Archive.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.io.Closeable; import java.io.File; @@ -20,10 +20,10 @@ import net.sf.sevenzipjbinding.ArchiveFormat; import net.sf.sevenzipjbinding.ISevenZipInArchive; import net.sf.sevenzipjbinding.PropID; import net.sf.sevenzipjbinding.SevenZipException; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.util.FileUtilities.ExtensionFileFilter; -import net.sourceforge.filebot.vfs.FileInfo; -import net.sourceforge.filebot.vfs.SimpleFileInfo; +import net.filebot.MediaTypes; +import net.filebot.util.FileUtilities.ExtensionFileFilter; +import net.filebot.vfs.FileInfo; +import net.filebot.vfs.SimpleFileInfo; public class Archive implements Closeable { diff --git a/source/net/filebot/archive/ArchiveOpenVolumeCallback.java b/source/net/filebot/archive/ArchiveOpenVolumeCallback.java index 83ddf1b6..1b9ff8a4 100644 --- a/source/net/filebot/archive/ArchiveOpenVolumeCallback.java +++ b/source/net/filebot/archive/ArchiveOpenVolumeCallback.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.io.Closeable; diff --git a/source/net/filebot/archive/ExtractCallback.java b/source/net/filebot/archive/ExtractCallback.java index c2126f63..c994ba15 100644 --- a/source/net/filebot/archive/ExtractCallback.java +++ b/source/net/filebot/archive/ExtractCallback.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.io.File; diff --git a/source/net/filebot/archive/ExtractOutProvider.java b/source/net/filebot/archive/ExtractOutProvider.java index 5fb02b0c..da2dbe89 100644 --- a/source/net/filebot/archive/ExtractOutProvider.java +++ b/source/net/filebot/archive/ExtractOutProvider.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.io.File; diff --git a/source/net/filebot/archive/ExtractOutStream.java b/source/net/filebot/archive/ExtractOutStream.java index deafaf99..fdeac9eb 100644 --- a/source/net/filebot/archive/ExtractOutStream.java +++ b/source/net/filebot/archive/ExtractOutStream.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.io.Closeable; diff --git a/source/net/filebot/archive/FileMapper.java b/source/net/filebot/archive/FileMapper.java index 0b5bbe96..4e8e0040 100644 --- a/source/net/filebot/archive/FileMapper.java +++ b/source/net/filebot/archive/FileMapper.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.io.File; diff --git a/source/net/filebot/archive/SevenZipLoader.java b/source/net/filebot/archive/SevenZipLoader.java index c29027e2..f2475302 100644 --- a/source/net/filebot/archive/SevenZipLoader.java +++ b/source/net/filebot/archive/SevenZipLoader.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.util.logging.Logger; diff --git a/source/net/filebot/archive/VolumedArchiveInStream.java b/source/net/filebot/archive/VolumedArchiveInStream.java index fb54364a..2d001264 100644 --- a/source/net/filebot/archive/VolumedArchiveInStream.java +++ b/source/net/filebot/archive/VolumedArchiveInStream.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.archive; +package net.filebot.archive; import java.text.MessageFormat; diff --git a/source/net/filebot/cli/ArgumentBean.java b/source/net/filebot/cli/ArgumentBean.java index 2c5938b8..976eac5c 100644 --- a/source/net/filebot/cli/ArgumentBean.java +++ b/source/net/filebot/cli/ArgumentBean.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import static java.util.Arrays.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.OutputStream; @@ -14,7 +14,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.Language; +import net.filebot.Language; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineException; diff --git a/source/net/filebot/cli/ArgumentProcessor.java b/source/net/filebot/cli/ArgumentProcessor.java index d1359477..a444ce45 100644 --- a/source/net/filebot/cli/ArgumentProcessor.java +++ b/source/net/filebot/cli/ArgumentProcessor.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.cli.CLILogging.*; -import static net.sourceforge.filebot.util.ExceptionUtilities.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.cli.CLILogging.*; +import static net.filebot.util.ExceptionUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.FileInputStream; @@ -23,11 +23,11 @@ import java.util.regex.Pattern; import javax.script.Bindings; import javax.script.SimpleBindings; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.StandardRenameAction; -import net.sourceforge.filebot.cli.ScriptShell.ScriptProvider; -import net.sourceforge.filebot.web.CachedResource; +import net.filebot.Analytics; +import net.filebot.MediaTypes; +import net.filebot.StandardRenameAction; +import net.filebot.cli.ScriptShell.ScriptProvider; +import net.filebot.web.CachedResource; public class ArgumentProcessor { diff --git a/source/net/filebot/cli/BindingsHandler.java b/source/net/filebot/cli/BindingsHandler.java index 00539f25..85a66df2 100644 --- a/source/net/filebot/cli/BindingsHandler.java +++ b/source/net/filebot/cli/BindingsHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import java.util.AbstractMap.SimpleEntry; diff --git a/source/net/filebot/cli/CLILogging.java b/source/net/filebot/cli/CLILogging.java index 2fd91ff6..2e416bd9 100644 --- a/source/net/filebot/cli/CLILogging.java +++ b/source/net/filebot/cli/CLILogging.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import static java.lang.System.*; @@ -12,7 +12,7 @@ import org.codehaus.groovy.runtime.StackTraceUtils; class CLILogging extends Handler { - public static final Logger CLILogger = createCommandlineLogger("net.sourceforge.filebot.logger.cli"); + public static final Logger CLILogger = createCommandlineLogger("net.filebot.logger.cli"); private static Logger createCommandlineLogger(String name) { Logger log = Logger.getLogger(name); diff --git a/source/net/filebot/cli/CmdlineInterface.java b/source/net/filebot/cli/CmdlineInterface.java index 2dee1d63..cfb5ca6d 100644 --- a/source/net/filebot/cli/CmdlineInterface.java +++ b/source/net/filebot/cli/CmdlineInterface.java @@ -1,11 +1,11 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import java.io.File; import java.io.FileFilter; import java.util.Collection; import java.util.List; -import net.sourceforge.filebot.RenameAction; +import net.filebot.RenameAction; public interface CmdlineInterface { diff --git a/source/net/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java index beadc7c1..56d48b0f 100644 --- a/source/net/filebot/cli/CmdlineOperations.java +++ b/source/net/filebot/cli/CmdlineOperations.java @@ -1,16 +1,16 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; 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.filebot.util.FileUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.Settings.*; +import static net.filebot.WebServices.*; +import static net.filebot.cli.CLILogging.*; +import static net.filebot.hash.VerificationUtilities.*; +import static net.filebot.media.MediaDetection.*; +import static net.filebot.subtitle.SubtitleUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.FileFilter; @@ -35,48 +35,48 @@ import java.util.TreeSet; import java.util.logging.Level; import java.util.regex.Pattern; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.HistorySpooler; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.RenameAction; -import net.sourceforge.filebot.archive.Archive; -import net.sourceforge.filebot.archive.FileMapper; -import net.sourceforge.filebot.format.ExpressionFilter; -import net.sourceforge.filebot.format.ExpressionFormat; -import net.sourceforge.filebot.format.MediaBindingBean; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.hash.VerificationFileReader; -import net.sourceforge.filebot.hash.VerificationFileWriter; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.similarity.CommonSequenceMatcher; -import net.sourceforge.filebot.similarity.EpisodeMatcher; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.similarity.NameSimilarityMetric; -import net.sourceforge.filebot.similarity.SeriesNameMatcher; -import net.sourceforge.filebot.similarity.SimilarityComparator; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.subtitle.SubtitleFormat; -import net.sourceforge.filebot.subtitle.SubtitleNaming; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.FileUtilities.ParentFilter; -import net.sourceforge.filebot.vfs.FileInfo; -import net.sourceforge.filebot.vfs.MemoryFile; -import net.sourceforge.filebot.vfs.SimpleFileInfo; -import net.sourceforge.filebot.web.AudioTrack; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.EpisodeFormat; -import net.sourceforge.filebot.web.EpisodeListProvider; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.MovieFormat; -import net.sourceforge.filebot.web.MovieIdentificationService; -import net.sourceforge.filebot.web.MoviePart; -import net.sourceforge.filebot.web.MusicIdentificationService; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.SortOrder; -import net.sourceforge.filebot.web.SubtitleDescriptor; -import net.sourceforge.filebot.web.SubtitleProvider; -import net.sourceforge.filebot.web.VideoHashSubtitleService; +import net.filebot.Analytics; +import net.filebot.HistorySpooler; +import net.filebot.Language; +import net.filebot.MediaTypes; +import net.filebot.RenameAction; +import net.filebot.archive.Archive; +import net.filebot.archive.FileMapper; +import net.filebot.format.ExpressionFilter; +import net.filebot.format.ExpressionFormat; +import net.filebot.format.MediaBindingBean; +import net.filebot.hash.HashType; +import net.filebot.hash.VerificationFileReader; +import net.filebot.hash.VerificationFileWriter; +import net.filebot.media.MediaDetection; +import net.filebot.similarity.CommonSequenceMatcher; +import net.filebot.similarity.EpisodeMatcher; +import net.filebot.similarity.Match; +import net.filebot.similarity.NameSimilarityMetric; +import net.filebot.similarity.SeriesNameMatcher; +import net.filebot.similarity.SimilarityComparator; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.subtitle.SubtitleFormat; +import net.filebot.subtitle.SubtitleNaming; +import net.filebot.util.FileUtilities; +import net.filebot.util.FileUtilities.ParentFilter; +import net.filebot.vfs.FileInfo; +import net.filebot.vfs.MemoryFile; +import net.filebot.vfs.SimpleFileInfo; +import net.filebot.web.AudioTrack; +import net.filebot.web.Episode; +import net.filebot.web.EpisodeFormat; +import net.filebot.web.EpisodeListProvider; +import net.filebot.web.Movie; +import net.filebot.web.MovieFormat; +import net.filebot.web.MovieIdentificationService; +import net.filebot.web.MoviePart; +import net.filebot.web.MusicIdentificationService; +import net.filebot.web.SearchResult; +import net.filebot.web.SortOrder; +import net.filebot.web.SubtitleDescriptor; +import net.filebot.web.SubtitleProvider; +import net.filebot.web.VideoHashSubtitleService; public class CmdlineOperations implements CmdlineInterface { diff --git a/source/net/filebot/cli/ConflictAction.java b/source/net/filebot/cli/ConflictAction.java index f9ea09d7..6a5c2f5c 100644 --- a/source/net/filebot/cli/ConflictAction.java +++ b/source/net/filebot/cli/ConflictAction.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; public enum ConflictAction { diff --git a/source/net/filebot/cli/FolderWatchService.java b/source/net/filebot/cli/FolderWatchService.java index 4cd91518..6fc2d99d 100644 --- a/source/net/filebot/cli/FolderWatchService.java +++ b/source/net/filebot/cli/FolderWatchService.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import static java.nio.file.StandardWatchEventKinds.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.Closeable; import java.io.File; @@ -24,8 +24,8 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.util.DefaultThreadFactory; -import net.sourceforge.filebot.util.Timer; +import net.filebot.util.DefaultThreadFactory; +import net.filebot.util.Timer; public abstract class FolderWatchService implements Closeable { diff --git a/source/net/filebot/cli/GroovyPad.java b/source/net/filebot/cli/GroovyPad.java index 5bc09ab9..45a4f49e 100644 --- a/source/net/filebot/cli/GroovyPad.java +++ b/source/net/filebot/cli/GroovyPad.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.BorderLayout; import java.awt.Color; @@ -35,11 +35,11 @@ import javax.swing.SwingWorker; import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.cli.ArgumentProcessor.DefaultScriptProvider; -import net.sourceforge.filebot.util.TeePrintStream; +import net.filebot.Analytics; +import net.filebot.ResourceManager; +import net.filebot.Settings; +import net.filebot.cli.ArgumentProcessor.DefaultScriptProvider; +import net.filebot.util.TeePrintStream; import org.fife.ui.rsyntaxtextarea.FileLocation; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; diff --git a/source/net/filebot/cli/ScriptShell.java b/source/net/filebot/cli/ScriptShell.java index 5178d9ae..4ae37019 100644 --- a/source/net/filebot/cli/ScriptShell.java +++ b/source/net/filebot/cli/ScriptShell.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import groovy.lang.GroovyClassLoader; diff --git a/source/net/filebot/cli/ScriptShellBaseClass.java b/source/net/filebot/cli/ScriptShellBaseClass.java index 231893ee..2e2ea660 100644 --- a/source/net/filebot/cli/ScriptShellBaseClass.java +++ b/source/net/filebot/cli/ScriptShellBaseClass.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import static java.util.Collections.*; import static java.util.EnumSet.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.cli.CLILogging.*; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.cli.CLILogging.*; +import static net.filebot.util.StringUtilities.*; import groovy.lang.Closure; import groovy.lang.MissingPropertyException; import groovy.lang.Script; @@ -31,17 +31,17 @@ import java.util.logging.Logger; import javax.script.Bindings; import javax.script.SimpleBindings; -import net.sourceforge.filebot.HistorySpooler; -import net.sourceforge.filebot.RenameAction; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.StandardRenameAction; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.format.AssociativeScriptObject; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.media.MetaAttributes; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.web.Movie; +import net.filebot.HistorySpooler; +import net.filebot.RenameAction; +import net.filebot.Settings; +import net.filebot.StandardRenameAction; +import net.filebot.WebServices; +import net.filebot.format.AssociativeScriptObject; +import net.filebot.media.MediaDetection; +import net.filebot.media.MetaAttributes; +import net.filebot.similarity.SeasonEpisodeMatcher.SxE; +import net.filebot.util.FileUtilities; +import net.filebot.web.Movie; import org.codehaus.groovy.runtime.StackTraceUtils; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; diff --git a/source/net/filebot/cli/ScriptShellMethods.java b/source/net/filebot/cli/ScriptShellMethods.java index 9d741793..bfeaaa25 100644 --- a/source/net/filebot/cli/ScriptShellMethods.java +++ b/source/net/filebot/cli/ScriptShellMethods.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.cli; +package net.filebot.cli; import static java.util.Arrays.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.MediaTypes.*; +import static net.filebot.MediaTypes.*; import groovy.lang.Closure; import java.io.File; @@ -22,15 +22,15 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.MetaAttributeView; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.media.MetaAttributes; -import net.sourceforge.filebot.similarity.NameSimilarityMetric; -import net.sourceforge.filebot.similarity.Normalization; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.web.WebRequest; +import net.filebot.MediaTypes; +import net.filebot.MetaAttributeView; +import net.filebot.media.MediaDetection; +import net.filebot.media.MetaAttributes; +import net.filebot.similarity.NameSimilarityMetric; +import net.filebot.similarity.Normalization; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.util.FileUtilities; +import net.filebot.web.WebRequest; import org.codehaus.groovy.runtime.DefaultGroovyMethods; diff --git a/source/net/filebot/format/AssociativeScriptObject.java b/source/net/filebot/format/AssociativeScriptObject.java index a0cefbba..3123a5c7 100644 --- a/source/net/filebot/format/AssociativeScriptObject.java +++ b/source/net/filebot/format/AssociativeScriptObject.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import groovy.lang.GroovyObjectSupport; diff --git a/source/net/filebot/format/BindingException.java b/source/net/filebot/format/BindingException.java index bcf6a573..ff2c1803 100644 --- a/source/net/filebot/format/BindingException.java +++ b/source/net/filebot/format/BindingException.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; public class BindingException extends RuntimeException { diff --git a/source/net/filebot/format/Define.java b/source/net/filebot/format/Define.java index 694590f9..e984e5dd 100644 --- a/source/net/filebot/format/Define.java +++ b/source/net/filebot/format/Define.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import static java.lang.annotation.ElementType.*; diff --git a/source/net/filebot/format/ExpressionBindings.java b/source/net/filebot/format/ExpressionBindings.java index 6a3b3f57..a9f90b5b 100644 --- a/source/net/filebot/format/ExpressionBindings.java +++ b/source/net/filebot/format/ExpressionBindings.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import java.lang.reflect.Method; import java.util.AbstractMap; @@ -9,7 +9,7 @@ import java.util.TreeMap; import javax.script.Bindings; -import net.sourceforge.filebot.util.ExceptionUtilities; +import net.filebot.util.ExceptionUtilities; public class ExpressionBindings extends AbstractMap implements Bindings { diff --git a/source/net/filebot/format/ExpressionException.java b/source/net/filebot/format/ExpressionException.java index 0ae8e41c..204dc96d 100644 --- a/source/net/filebot/format/ExpressionException.java +++ b/source/net/filebot/format/ExpressionException.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import javax.script.ScriptException; diff --git a/source/net/filebot/format/ExpressionFilter.java b/source/net/filebot/format/ExpressionFilter.java index 1af07afd..bcfee0a5 100644 --- a/source/net/filebot/format/ExpressionFilter.java +++ b/source/net/filebot/format/ExpressionFilter.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import java.security.AccessController; diff --git a/source/net/filebot/format/ExpressionFormat.java b/source/net/filebot/format/ExpressionFormat.java index 82738e4e..1c0a70d5 100644 --- a/source/net/filebot/format/ExpressionFormat.java +++ b/source/net/filebot/format/ExpressionFormat.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; -import static net.sourceforge.filebot.util.ExceptionUtilities.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.ExceptionUtilities.*; +import static net.filebot.util.FileUtilities.*; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyRuntimeException; import groovy.lang.MissingPropertyException; diff --git a/source/net/filebot/format/ExpressionFormatFunctions.java b/source/net/filebot/format/ExpressionFormatFunctions.java index dd310500..24f8025a 100644 --- a/source/net/filebot/format/ExpressionFormatFunctions.java +++ b/source/net/filebot/format/ExpressionFormatFunctions.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import groovy.lang.Closure; diff --git a/source/net/filebot/format/ExpressionFormatMethods.java b/source/net/filebot/format/ExpressionFormatMethods.java index 5f34c161..ffc14479 100644 --- a/source/net/filebot/format/ExpressionFormatMethods.java +++ b/source/net/filebot/format/ExpressionFormatMethods.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import static java.util.regex.Pattern.*; @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.util.FileUtilities; import com.ibm.icu.text.Transliterator; diff --git a/source/net/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java index 408cc420..f3511d90 100644 --- a/source/net/filebot/format/MediaBindingBean.java +++ b/source/net/filebot/format/MediaBindingBean.java @@ -1,15 +1,15 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import static java.util.Arrays.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.MediaTypes.*; -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.util.FileUtilities.*; -import static net.sourceforge.filebot.util.StringUtilities.*; -import static net.sourceforge.filebot.web.EpisodeFormat.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.format.Define.*; +import static net.filebot.hash.VerificationUtilities.*; +import static net.filebot.media.MediaDetection.*; +import static net.filebot.similarity.Normalization.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.StringUtilities.*; +import static net.filebot.web.EpisodeFormat.*; import java.io.File; import java.io.IOException; @@ -27,29 +27,29 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.media.MetaAttributes; -import net.sourceforge.filebot.mediainfo.MediaInfo; -import net.sourceforge.filebot.mediainfo.MediaInfo.StreamKind; -import net.sourceforge.filebot.similarity.SimilarityComparator; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.FileUtilities.ExtensionFileFilter; -import net.sourceforge.filebot.web.AnidbSearchResult; -import net.sourceforge.filebot.web.AudioTrack; -import net.sourceforge.filebot.web.SimpleDate; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.EpisodeListProvider; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.MoviePart; -import net.sourceforge.filebot.web.MultiEpisode; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.SortOrder; -import net.sourceforge.filebot.web.TheTVDBSearchResult; +import net.filebot.Cache; +import net.filebot.Language; +import net.filebot.MediaTypes; +import net.filebot.Settings; +import net.filebot.WebServices; +import net.filebot.hash.HashType; +import net.filebot.media.MetaAttributes; +import net.filebot.mediainfo.MediaInfo; +import net.filebot.mediainfo.MediaInfo.StreamKind; +import net.filebot.similarity.SimilarityComparator; +import net.filebot.util.FileUtilities; +import net.filebot.util.FileUtilities.ExtensionFileFilter; +import net.filebot.web.AnidbSearchResult; +import net.filebot.web.AudioTrack; +import net.filebot.web.SimpleDate; +import net.filebot.web.Episode; +import net.filebot.web.EpisodeListProvider; +import net.filebot.web.Movie; +import net.filebot.web.MoviePart; +import net.filebot.web.MultiEpisode; +import net.filebot.web.SearchResult; +import net.filebot.web.SortOrder; +import net.filebot.web.TheTVDBSearchResult; import com.cedarsoftware.util.io.JsonWriter; diff --git a/source/net/filebot/format/PrivilegedInvocation.java b/source/net/filebot/format/PrivilegedInvocation.java index 2e46fef4..a98140cd 100644 --- a/source/net/filebot/format/PrivilegedInvocation.java +++ b/source/net/filebot/format/PrivilegedInvocation.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import java.lang.reflect.InvocationHandler; diff --git a/source/net/filebot/format/PropertyBindings.java b/source/net/filebot/format/PropertyBindings.java index 1defc987..81c8d849 100644 --- a/source/net/filebot/format/PropertyBindings.java +++ b/source/net/filebot/format/PropertyBindings.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import java.lang.reflect.Method; diff --git a/source/net/filebot/format/SecureCompiledScript.java b/source/net/filebot/format/SecureCompiledScript.java index 4d894a3c..579d3926 100644 --- a/source/net/filebot/format/SecureCompiledScript.java +++ b/source/net/filebot/format/SecureCompiledScript.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import java.io.File; import java.io.FilePermission; @@ -19,7 +19,7 @@ import javax.script.ScriptContext; import javax.script.ScriptEngine; import javax.script.ScriptException; -import net.sourceforge.filebot.util.ExceptionUtilities; +import net.filebot.util.ExceptionUtilities; public class SecureCompiledScript extends CompiledScript { diff --git a/source/net/filebot/gio/GIOLibrary.java b/source/net/filebot/gio/GIOLibrary.java index 0bb376cd..bb7b20e5 100644 --- a/source/net/filebot/gio/GIOLibrary.java +++ b/source/net/filebot/gio/GIOLibrary.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.gio; +package net.filebot.gio; import com.sun.jna.Library; diff --git a/source/net/filebot/gio/GVFS.java b/source/net/filebot/gio/GVFS.java index d0d8ac65..8c623311 100644 --- a/source/net/filebot/gio/GVFS.java +++ b/source/net/filebot/gio/GVFS.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.gio; +package net.filebot.gio; import java.io.File; diff --git a/source/net/filebot/hash/ChecksumHash.java b/source/net/filebot/hash/ChecksumHash.java index 5fe6dc96..33fbf12d 100644 --- a/source/net/filebot/hash/ChecksumHash.java +++ b/source/net/filebot/hash/ChecksumHash.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.util.zip.Checksum; diff --git a/source/net/filebot/hash/Ed2kHash.java b/source/net/filebot/hash/Ed2kHash.java index a6eeda40..01502b17 100644 --- a/source/net/filebot/hash/Ed2kHash.java +++ b/source/net/filebot/hash/Ed2kHash.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.math.BigInteger; diff --git a/source/net/filebot/hash/Hash.java b/source/net/filebot/hash/Hash.java index b27c2c70..5014aae6 100644 --- a/source/net/filebot/hash/Hash.java +++ b/source/net/filebot/hash/Hash.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; public interface Hash { diff --git a/source/net/filebot/hash/HashType.java b/source/net/filebot/hash/HashType.java index 518f5bdc..d8c2f208 100644 --- a/source/net/filebot/hash/HashType.java +++ b/source/net/filebot/hash/HashType.java @@ -1,11 +1,11 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.util.zip.CRC32; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.util.FileUtilities.ExtensionFileFilter; +import net.filebot.MediaTypes; +import net.filebot.util.FileUtilities.ExtensionFileFilter; public enum HashType { diff --git a/source/net/filebot/hash/MessageDigestHash.java b/source/net/filebot/hash/MessageDigestHash.java index 3e18e59f..972f85a3 100644 --- a/source/net/filebot/hash/MessageDigestHash.java +++ b/source/net/filebot/hash/MessageDigestHash.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.math.BigInteger; diff --git a/source/net/filebot/hash/SfvFormat.java b/source/net/filebot/hash/SfvFormat.java index da5390ca..ea0b811e 100644 --- a/source/net/filebot/hash/SfvFormat.java +++ b/source/net/filebot/hash/SfvFormat.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.io.File; diff --git a/source/net/filebot/hash/VerificationFileReader.java b/source/net/filebot/hash/VerificationFileReader.java index 5864c5a8..1ae4f611 100644 --- a/source/net/filebot/hash/VerificationFileReader.java +++ b/source/net/filebot/hash/VerificationFileReader.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.io.Closeable; diff --git a/source/net/filebot/hash/VerificationFileWriter.java b/source/net/filebot/hash/VerificationFileWriter.java index 7587e901..d39e20f4 100644 --- a/source/net/filebot/hash/VerificationFileWriter.java +++ b/source/net/filebot/hash/VerificationFileWriter.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.io.Closeable; @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Date; -import net.sourceforge.filebot.Settings; +import net.filebot.Settings; public class VerificationFileWriter implements Closeable { diff --git a/source/net/filebot/hash/VerificationFormat.java b/source/net/filebot/hash/VerificationFormat.java index 45d561bf..8783261a 100644 --- a/source/net/filebot/hash/VerificationFormat.java +++ b/source/net/filebot/hash/VerificationFormat.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import java.io.File; diff --git a/source/net/filebot/hash/VerificationUtilities.java b/source/net/filebot/hash/VerificationUtilities.java index b00da860..b5e1dc94 100644 --- a/source/net/filebot/hash/VerificationUtilities.java +++ b/source/net/filebot/hash/VerificationUtilities.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.FileInputStream; diff --git a/source/net/filebot/media/MediaDetection.java b/source/net/filebot/media/MediaDetection.java index 58204a16..9fde0ff4 100644 --- a/source/net/filebot/media/MediaDetection.java +++ b/source/net/filebot/media/MediaDetection.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.media; +package net.filebot.media; 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.filebot.util.FileUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.Settings.*; +import static net.filebot.similarity.CommonSequenceMatcher.*; +import static net.filebot.similarity.Normalization.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.FileFilter; @@ -40,31 +40,31 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.archive.Archive; -import net.sourceforge.filebot.format.MediaBindingBean; -import net.sourceforge.filebot.similarity.CommonSequenceMatcher; -import net.sourceforge.filebot.similarity.DateMatcher; -import net.sourceforge.filebot.similarity.DateMetric; -import net.sourceforge.filebot.similarity.MetricAvg; -import net.sourceforge.filebot.similarity.NameSimilarityMetric; -import net.sourceforge.filebot.similarity.NumericSimilarityMetric; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SeasonEpisodePattern; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; -import net.sourceforge.filebot.similarity.SequenceMatchSimilarity; -import net.sourceforge.filebot.similarity.SeriesNameMatcher; -import net.sourceforge.filebot.similarity.SimilarityComparator; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.similarity.StringEqualsMetric; -import net.sourceforge.filebot.vfs.FileInfo; -import net.sourceforge.filebot.web.SimpleDate; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.MovieIdentificationService; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.TheTVDBClient.SeriesInfo; -import net.sourceforge.filebot.web.TheTVDBSearchResult; +import net.filebot.WebServices; +import net.filebot.archive.Archive; +import net.filebot.format.MediaBindingBean; +import net.filebot.similarity.CommonSequenceMatcher; +import net.filebot.similarity.DateMatcher; +import net.filebot.similarity.DateMetric; +import net.filebot.similarity.MetricAvg; +import net.filebot.similarity.NameSimilarityMetric; +import net.filebot.similarity.NumericSimilarityMetric; +import net.filebot.similarity.SeasonEpisodeMatcher; +import net.filebot.similarity.SeasonEpisodeMatcher.SeasonEpisodePattern; +import net.filebot.similarity.SeasonEpisodeMatcher.SxE; +import net.filebot.similarity.SequenceMatchSimilarity; +import net.filebot.similarity.SeriesNameMatcher; +import net.filebot.similarity.SimilarityComparator; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.similarity.StringEqualsMetric; +import net.filebot.vfs.FileInfo; +import net.filebot.web.SimpleDate; +import net.filebot.web.Episode; +import net.filebot.web.Movie; +import net.filebot.web.MovieIdentificationService; +import net.filebot.web.SearchResult; +import net.filebot.web.TheTVDBClient.SeriesInfo; +import net.filebot.web.TheTVDBSearchResult; public class MediaDetection { diff --git a/source/net/filebot/media/MetaAttributes.java b/source/net/filebot/media/MetaAttributes.java index 4c13f9fe..db54c5e2 100644 --- a/source/net/filebot/media/MetaAttributes.java +++ b/source/net/filebot/media/MetaAttributes.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.media; +package net.filebot.media; import java.io.File; import java.io.IOException; @@ -6,7 +6,7 @@ import java.nio.file.Files; import java.nio.file.attribute.BasicFileAttributeView; import java.nio.file.attribute.FileTime; -import net.sourceforge.filebot.MetaAttributeView; +import net.filebot.MetaAttributeView; import com.cedarsoftware.util.io.JsonReader; import com.cedarsoftware.util.io.JsonWriter; diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java index bd0696bf..c9a2a2aa 100644 --- a/source/net/filebot/media/ReleaseInfo.java +++ b/source/net/filebot/media/ReleaseInfo.java @@ -1,13 +1,13 @@ -package net.sourceforge.filebot.media; +package net.filebot.media; 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.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.similarity.Normalization.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.io.File; import java.io.FileFilter; @@ -31,12 +31,12 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.filebot.util.ByteBufferInputStream; -import net.sourceforge.filebot.util.FileUtilities.RegexFileFilter; -import net.sourceforge.filebot.web.AnidbSearchResult; -import net.sourceforge.filebot.web.CachedResource; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.TheTVDBSearchResult; +import net.filebot.util.ByteBufferInputStream; +import net.filebot.util.FileUtilities.RegexFileFilter; +import net.filebot.web.AnidbSearchResult; +import net.filebot.web.CachedResource; +import net.filebot.web.Movie; +import net.filebot.web.TheTVDBSearchResult; import org.tukaani.xz.XZInputStream; diff --git a/source/net/filebot/media/SmartSeasonEpisodeMatcher.java b/source/net/filebot/media/SmartSeasonEpisodeMatcher.java index e2560607..47d1b635 100644 --- a/source/net/filebot/media/SmartSeasonEpisodeMatcher.java +++ b/source/net/filebot/media/SmartSeasonEpisodeMatcher.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.media; +package net.filebot.media; import java.io.File; import java.util.List; import java.util.regex.Pattern; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher; +import net.filebot.similarity.SeasonEpisodeMatcher; public class SmartSeasonEpisodeMatcher extends SeasonEpisodeMatcher { diff --git a/source/net/filebot/mediainfo/MediaDurationFilter.java b/source/net/filebot/mediainfo/MediaDurationFilter.java index b4a06eff..6e99fadd 100644 --- a/source/net/filebot/mediainfo/MediaDurationFilter.java +++ b/source/net/filebot/mediainfo/MediaDurationFilter.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.mediainfo; +package net.filebot.mediainfo; import java.io.File; import java.io.FileFilter; -import net.sourceforge.filebot.mediainfo.MediaInfo.StreamKind; +import net.filebot.mediainfo.MediaInfo.StreamKind; public class MediaDurationFilter implements FileFilter { diff --git a/source/net/filebot/mediainfo/MediaInfo.java b/source/net/filebot/mediainfo/MediaInfo.java index e601651c..cd59f2c4 100644 --- a/source/net/filebot/mediainfo/MediaInfo.java +++ b/source/net/filebot/mediainfo/MediaInfo.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.mediainfo; +package net.filebot.mediainfo; import java.io.Closeable; diff --git a/source/net/filebot/mediainfo/MediaInfoException.java b/source/net/filebot/mediainfo/MediaInfoException.java index 61023fdb..116cbba6 100644 --- a/source/net/filebot/mediainfo/MediaInfoException.java +++ b/source/net/filebot/mediainfo/MediaInfoException.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.mediainfo; +package net.filebot.mediainfo; import com.sun.jna.Platform; diff --git a/source/net/filebot/mediainfo/MediaInfoLibrary.java b/source/net/filebot/mediainfo/MediaInfoLibrary.java index 226d23e1..fb5af5b5 100644 --- a/source/net/filebot/mediainfo/MediaInfoLibrary.java +++ b/source/net/filebot/mediainfo/MediaInfoLibrary.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.mediainfo; +package net.filebot.mediainfo; import static java.util.Collections.*; diff --git a/source/net/filebot/similarity/CommonSequenceMatcher.java b/source/net/filebot/similarity/CommonSequenceMatcher.java index 848b5efe..c7c3e1fe 100644 --- a/source/net/filebot/similarity/CommonSequenceMatcher.java +++ b/source/net/filebot/similarity/CommonSequenceMatcher.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.util.Arrays.*; import static java.util.Collections.*; diff --git a/source/net/filebot/similarity/CrossPropertyMetric.java b/source/net/filebot/similarity/CrossPropertyMetric.java index 8a6a8608..7ce91631 100644 --- a/source/net/filebot/similarity/CrossPropertyMetric.java +++ b/source/net/filebot/similarity/CrossPropertyMetric.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import net.sourceforge.filebot.format.PropertyBindings; +import net.filebot.format.PropertyBindings; public class CrossPropertyMetric implements SimilarityMetric { diff --git a/source/net/filebot/similarity/DateMatcher.java b/source/net/filebot/similarity/DateMatcher.java index f68efd00..f9954a30 100644 --- a/source/net/filebot/similarity/DateMatcher.java +++ b/source/net/filebot/similarity/DateMatcher.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.filebot.web.SimpleDate; +import net.filebot.web.SimpleDate; public class DateMatcher { diff --git a/source/net/filebot/similarity/DateMetric.java b/source/net/filebot/similarity/DateMetric.java index fbd34d9d..06a7483d 100644 --- a/source/net/filebot/similarity/DateMetric.java +++ b/source/net/filebot/similarity/DateMetric.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.io.File; -import net.sourceforge.filebot.web.SimpleDate; +import net.filebot.web.SimpleDate; public class DateMetric implements SimilarityMetric { diff --git a/source/net/filebot/similarity/EpisodeMatcher.java b/source/net/filebot/similarity/EpisodeMatcher.java index 63a1794e..30cb7d8c 100644 --- a/source/net/filebot/similarity/EpisodeMatcher.java +++ b/source/net/filebot/similarity/EpisodeMatcher.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.util.Collections.*; @@ -13,9 +13,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.MultiEpisode; +import net.filebot.similarity.SeasonEpisodeMatcher.SxE; +import net.filebot.web.Episode; +import net.filebot.web.MultiEpisode; public class EpisodeMatcher extends Matcher { diff --git a/source/net/filebot/similarity/EpisodeMetrics.java b/source/net/filebot/similarity/EpisodeMetrics.java index fb41a07c..96592cef 100644 --- a/source/net/filebot/similarity/EpisodeMetrics.java +++ b/source/net/filebot/similarity/EpisodeMetrics.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.lang.Math.*; import static java.util.Collections.*; import static java.util.regex.Pattern.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.similarity.Normalization.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.similarity.Normalization.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.io.File; import java.io.IOException; @@ -27,17 +27,17 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.media.ReleaseInfo; -import net.sourceforge.filebot.media.SmartSeasonEpisodeMatcher; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; -import net.sourceforge.filebot.vfs.FileInfo; -import net.sourceforge.filebot.web.SimpleDate; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.EpisodeFormat; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.TheTVDBClient.SeriesInfo; -import net.sourceforge.filebot.web.TheTVDBSearchResult; +import net.filebot.WebServices; +import net.filebot.media.ReleaseInfo; +import net.filebot.media.SmartSeasonEpisodeMatcher; +import net.filebot.similarity.SeasonEpisodeMatcher.SxE; +import net.filebot.vfs.FileInfo; +import net.filebot.web.SimpleDate; +import net.filebot.web.Episode; +import net.filebot.web.EpisodeFormat; +import net.filebot.web.Movie; +import net.filebot.web.TheTVDBClient.SeriesInfo; +import net.filebot.web.TheTVDBSearchResult; import com.ibm.icu.text.Transliterator; @@ -645,7 +645,7 @@ public enum EpisodeMetrics implements SimilarityMetric { // deserialize MetaAttributes if enabled and available if (object instanceof File && useExtendedFileAttributes()) { try { - return super.getProperties(new net.sourceforge.filebot.media.MetaAttributes((File) object).getObject()); + return super.getProperties(new net.filebot.media.MetaAttributes((File) object).getObject()); } catch (Throwable e) { // ignore } diff --git a/source/net/filebot/similarity/FileNameMetric.java b/source/net/filebot/similarity/FileNameMetric.java index 55e2ab96..fe3ec18a 100644 --- a/source/net/filebot/similarity/FileNameMetric.java +++ b/source/net/filebot/similarity/FileNameMetric.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; diff --git a/source/net/filebot/similarity/FileSizeMetric.java b/source/net/filebot/similarity/FileSizeMetric.java index 2cb356d7..d0ed9c66 100644 --- a/source/net/filebot/similarity/FileSizeMetric.java +++ b/source/net/filebot/similarity/FileSizeMetric.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.io.File; diff --git a/source/net/filebot/similarity/Match.java b/source/net/filebot/similarity/Match.java index 2f0ccd64..83ee9c61 100644 --- a/source/net/filebot/similarity/Match.java +++ b/source/net/filebot/similarity/Match.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.util.Arrays; diff --git a/source/net/filebot/similarity/Matcher.java b/source/net/filebot/similarity/Matcher.java index dd0d92d8..04b68d2e 100644 --- a/source/net/filebot/similarity/Matcher.java +++ b/source/net/filebot/similarity/Matcher.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.util.Collections.*; diff --git a/source/net/filebot/similarity/MetricAvg.java b/source/net/filebot/similarity/MetricAvg.java index d2e1069b..c02a3853 100644 --- a/source/net/filebot/similarity/MetricAvg.java +++ b/source/net/filebot/similarity/MetricAvg.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; public class MetricAvg implements SimilarityMetric { diff --git a/source/net/filebot/similarity/MetricCascade.java b/source/net/filebot/similarity/MetricCascade.java index b582d61c..f4de1107 100644 --- a/source/net/filebot/similarity/MetricCascade.java +++ b/source/net/filebot/similarity/MetricCascade.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.lang.Math.*; diff --git a/source/net/filebot/similarity/MetricMin.java b/source/net/filebot/similarity/MetricMin.java index 276d99c9..8b438684 100644 --- a/source/net/filebot/similarity/MetricMin.java +++ b/source/net/filebot/similarity/MetricMin.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; public class MetricMin implements SimilarityMetric { diff --git a/source/net/filebot/similarity/NameSimilarityMetric.java b/source/net/filebot/similarity/NameSimilarityMetric.java index b85a8312..b0b59c0b 100644 --- a/source/net/filebot/similarity/NameSimilarityMetric.java +++ b/source/net/filebot/similarity/NameSimilarityMetric.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; -import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.filebot.similarity.Normalization.*; import uk.ac.shef.wit.simmetrics.similaritymetrics.AbstractStringMetric; import uk.ac.shef.wit.simmetrics.similaritymetrics.QGramsDistance; import uk.ac.shef.wit.simmetrics.tokenisers.TokeniserQGram3; diff --git a/source/net/filebot/similarity/Normalization.java b/source/net/filebot/similarity/Normalization.java index c83d21b5..42a1afd5 100644 --- a/source/net/filebot/similarity/Normalization.java +++ b/source/net/filebot/similarity/Normalization.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.util.regex.Pattern.*; diff --git a/source/net/filebot/similarity/NumericSimilarityMetric.java b/source/net/filebot/similarity/NumericSimilarityMetric.java index a528e521..846840a9 100644 --- a/source/net/filebot/similarity/NumericSimilarityMetric.java +++ b/source/net/filebot/similarity/NumericSimilarityMetric.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.util.ArrayList; diff --git a/source/net/filebot/similarity/SeasonEpisodeMatcher.java b/source/net/filebot/similarity/SeasonEpisodeMatcher.java index 31844a81..b084a2c4 100644 --- a/source/net/filebot/similarity/SeasonEpisodeMatcher.java +++ b/source/net/filebot/similarity/SeasonEpisodeMatcher.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.util.Collections.*; import static java.util.regex.Pattern.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.util.ArrayList; diff --git a/source/net/filebot/similarity/SeasonEpisodeMetric.java b/source/net/filebot/similarity/SeasonEpisodeMetric.java index 925bc502..2c45f6b7 100644 --- a/source/net/filebot/similarity/SeasonEpisodeMetric.java +++ b/source/net/filebot/similarity/SeasonEpisodeMetric.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.io.File; import java.util.Collection; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; +import net.filebot.similarity.SeasonEpisodeMatcher.SxE; public class SeasonEpisodeMetric implements SimilarityMetric { diff --git a/source/net/filebot/similarity/SequenceMatchSimilarity.java b/source/net/filebot/similarity/SequenceMatchSimilarity.java index 1f051a20..556c0cde 100644 --- a/source/net/filebot/similarity/SequenceMatchSimilarity.java +++ b/source/net/filebot/similarity/SequenceMatchSimilarity.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.lang.Math.*; -import static net.sourceforge.filebot.similarity.CommonSequenceMatcher.*; -import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.filebot.similarity.CommonSequenceMatcher.*; +import static net.filebot.similarity.Normalization.*; import java.util.Locale; diff --git a/source/net/filebot/similarity/SeriesNameMatcher.java b/source/net/filebot/similarity/SeriesNameMatcher.java index 51438901..a2fae4a8 100644 --- a/source/net/filebot/similarity/SeriesNameMatcher.java +++ b/source/net/filebot/similarity/SeriesNameMatcher.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.util.Collections.*; import static java.util.regex.Pattern.*; -import static net.sourceforge.filebot.similarity.CommonSequenceMatcher.*; -import static net.sourceforge.filebot.similarity.Normalization.*; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.similarity.CommonSequenceMatcher.*; +import static net.filebot.similarity.Normalization.*; +import static net.filebot.util.StringUtilities.*; import java.io.File; import java.text.CollationKey; @@ -24,8 +24,8 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.similarity.SeasonEpisodeMatcher.SxE; +import net.filebot.util.FileUtilities; public class SeriesNameMatcher { diff --git a/source/net/filebot/similarity/SimilarityComparator.java b/source/net/filebot/similarity/SimilarityComparator.java index bbc586ad..978ce2cd 100644 --- a/source/net/filebot/similarity/SimilarityComparator.java +++ b/source/net/filebot/similarity/SimilarityComparator.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import java.util.Comparator; diff --git a/source/net/filebot/similarity/SimilarityMetric.java b/source/net/filebot/similarity/SimilarityMetric.java index 85c527c4..1f0f4058 100644 --- a/source/net/filebot/similarity/SimilarityMetric.java +++ b/source/net/filebot/similarity/SimilarityMetric.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; public interface SimilarityMetric { diff --git a/source/net/filebot/similarity/StrictEpisodeMetrics.java b/source/net/filebot/similarity/StrictEpisodeMetrics.java index 8ad78c39..14bcfa4a 100644 --- a/source/net/filebot/similarity/StrictEpisodeMetrics.java +++ b/source/net/filebot/similarity/StrictEpisodeMetrics.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.lang.Math.*; diff --git a/source/net/filebot/similarity/StringEqualsMetric.java b/source/net/filebot/similarity/StringEqualsMetric.java index d03d9978..67bbb5c3 100644 --- a/source/net/filebot/similarity/StringEqualsMetric.java +++ b/source/net/filebot/similarity/StringEqualsMetric.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; public class StringEqualsMetric implements SimilarityMetric { diff --git a/source/net/filebot/similarity/SubstringMetric.java b/source/net/filebot/similarity/SubstringMetric.java index a9fa20a3..67184ba8 100644 --- a/source/net/filebot/similarity/SubstringMetric.java +++ b/source/net/filebot/similarity/SubstringMetric.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; -import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.filebot.similarity.Normalization.*; public class SubstringMetric implements SimilarityMetric { diff --git a/source/net/filebot/similarity/TimeStampMetric.java b/source/net/filebot/similarity/TimeStampMetric.java index 396070b8..8485c1ae 100644 --- a/source/net/filebot/similarity/TimeStampMetric.java +++ b/source/net/filebot/similarity/TimeStampMetric.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.lang.Math.*; diff --git a/source/net/filebot/subtitle/MicroDVDReader.java b/source/net/filebot/subtitle/MicroDVDReader.java index bc139bd7..6bfa0803 100644 --- a/source/net/filebot/subtitle/MicroDVDReader.java +++ b/source/net/filebot/subtitle/MicroDVDReader.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.util.ArrayList; import java.util.List; diff --git a/source/net/filebot/subtitle/SubRipReader.java b/source/net/filebot/subtitle/SubRipReader.java index 6af5d2e1..79158437 100644 --- a/source/net/filebot/subtitle/SubRipReader.java +++ b/source/net/filebot/subtitle/SubRipReader.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/source/net/filebot/subtitle/SubRipWriter.java b/source/net/filebot/subtitle/SubRipWriter.java index ce1514bd..2672c380 100644 --- a/source/net/filebot/subtitle/SubRipWriter.java +++ b/source/net/filebot/subtitle/SubRipWriter.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import java.io.Closeable; diff --git a/source/net/filebot/subtitle/SubStationAlphaReader.java b/source/net/filebot/subtitle/SubStationAlphaReader.java index f111ced8..3ac68020 100644 --- a/source/net/filebot/subtitle/SubStationAlphaReader.java +++ b/source/net/filebot/subtitle/SubStationAlphaReader.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import java.text.DateFormat; diff --git a/source/net/filebot/subtitle/SubViewerReader.java b/source/net/filebot/subtitle/SubViewerReader.java index f61e5172..9a9c2b1d 100644 --- a/source/net/filebot/subtitle/SubViewerReader.java +++ b/source/net/filebot/subtitle/SubViewerReader.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import static java.util.regex.Pattern.*; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.text.DateFormat; import java.text.ParseException; diff --git a/source/net/filebot/subtitle/SubtitleElement.java b/source/net/filebot/subtitle/SubtitleElement.java index 6ed3780c..3a228826 100644 --- a/source/net/filebot/subtitle/SubtitleElement.java +++ b/source/net/filebot/subtitle/SubtitleElement.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; public class SubtitleElement { diff --git a/source/net/filebot/subtitle/SubtitleFormat.java b/source/net/filebot/subtitle/SubtitleFormat.java index 72408827..803861b1 100644 --- a/source/net/filebot/subtitle/SubtitleFormat.java +++ b/source/net/filebot/subtitle/SubtitleFormat.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.util.FileUtilities.ExtensionFileFilter; +import net.filebot.MediaTypes; +import net.filebot.util.FileUtilities.ExtensionFileFilter; public enum SubtitleFormat { diff --git a/source/net/filebot/subtitle/SubtitleNaming.java b/source/net/filebot/subtitle/SubtitleNaming.java index e06f3eb2..a323283d 100644 --- a/source/net/filebot/subtitle/SubtitleNaming.java +++ b/source/net/filebot/subtitle/SubtitleNaming.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; -import net.sourceforge.filebot.web.SubtitleDescriptor; +import net.filebot.web.SubtitleDescriptor; public enum SubtitleNaming { diff --git a/source/net/filebot/subtitle/SubtitleReader.java b/source/net/filebot/subtitle/SubtitleReader.java index ff6b1c0b..43944e34 100644 --- a/source/net/filebot/subtitle/SubtitleReader.java +++ b/source/net/filebot/subtitle/SubtitleReader.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import java.io.Closeable; diff --git a/source/net/filebot/subtitle/SubtitleTimeFormat.java b/source/net/filebot/subtitle/SubtitleTimeFormat.java index 1a653d5d..cfc16d29 100644 --- a/source/net/filebot/subtitle/SubtitleTimeFormat.java +++ b/source/net/filebot/subtitle/SubtitleTimeFormat.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import java.text.DateFormat; diff --git a/source/net/filebot/subtitle/SubtitleUtilities.java b/source/net/filebot/subtitle/SubtitleUtilities.java index 7435b1a8..7e5f1717 100644 --- a/source/net/filebot/subtitle/SubtitleUtilities.java +++ b/source/net/filebot/subtitle/SubtitleUtilities.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import static java.lang.Math.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.media.MediaDetection.*; -import static net.sourceforge.filebot.similarity.EpisodeMetrics.*; -import static net.sourceforge.filebot.similarity.Normalization.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.media.MediaDetection.*; +import static net.filebot.similarity.EpisodeMetrics.*; +import static net.filebot.similarity.Normalization.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.IOException; @@ -30,21 +30,21 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.TreeSet; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.similarity.EpisodeMetrics; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.similarity.Matcher; -import net.sourceforge.filebot.similarity.MetricAvg; -import net.sourceforge.filebot.similarity.MetricCascade; -import net.sourceforge.filebot.similarity.NameSimilarityMetric; -import net.sourceforge.filebot.similarity.SequenceMatchSimilarity; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.vfs.ArchiveType; -import net.sourceforge.filebot.vfs.MemoryFile; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.SubtitleDescriptor; -import net.sourceforge.filebot.web.SubtitleProvider; +import net.filebot.Language; +import net.filebot.similarity.EpisodeMetrics; +import net.filebot.similarity.Match; +import net.filebot.similarity.Matcher; +import net.filebot.similarity.MetricAvg; +import net.filebot.similarity.MetricCascade; +import net.filebot.similarity.NameSimilarityMetric; +import net.filebot.similarity.SequenceMatchSimilarity; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.vfs.ArchiveType; +import net.filebot.vfs.MemoryFile; +import net.filebot.web.Movie; +import net.filebot.web.SearchResult; +import net.filebot.web.SubtitleDescriptor; +import net.filebot.web.SubtitleProvider; public final class SubtitleUtilities { diff --git a/source/net/filebot/torrent/BDecoder.java b/source/net/filebot/torrent/BDecoder.java index 1e4b167e..00534408 100644 --- a/source/net/filebot/torrent/BDecoder.java +++ b/source/net/filebot/torrent/BDecoder.java @@ -20,7 +20,7 @@ * 8 Allee Lenotre, La Grille Royale, 78600 Le Mesnil le Roi, France. */ -package net.sourceforge.filebot.torrent; +package net.filebot.torrent; import java.io.IOException; diff --git a/source/net/filebot/torrent/Torrent.java b/source/net/filebot/torrent/Torrent.java index 702e3f90..5e4209fd 100644 --- a/source/net/filebot/torrent/Torrent.java +++ b/source/net/filebot/torrent/Torrent.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.torrent; +package net.filebot.torrent; import java.io.BufferedInputStream; diff --git a/source/net/filebot/ui/AbstractSearchPanel.java b/source/net/filebot/ui/AbstractSearchPanel.java index 4a01743d..9bf3c04f 100644 --- a/source/net/filebot/ui/AbstractSearchPanel.java +++ b/source/net/filebot/ui/AbstractSearchPanel.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import static javax.swing.ScrollPaneConstants.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Dimension; import java.awt.Window; @@ -32,12 +32,12 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.ui.LabelProvider; -import net.sourceforge.filebot.util.ui.SelectButton; -import net.sourceforge.filebot.web.SearchResult; +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 ca.odell.glazedlists.BasicEventList; import ca.odell.glazedlists.matchers.TextMatcherEditor; import ca.odell.glazedlists.swing.AutoCompleteSupport; diff --git a/source/net/filebot/ui/FileBotList.java b/source/net/filebot/ui/FileBotList.java index 0d9e2ef3..3b83bdaa 100644 --- a/source/net/filebot/ui/FileBotList.java +++ b/source/net/filebot/ui/FileBotList.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.BorderLayout; @@ -15,11 +15,11 @@ import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import javax.swing.border.TitledBorder; -import net.sourceforge.filebot.ui.transfer.DefaultTransferHandler; -import net.sourceforge.filebot.ui.transfer.TextFileExportHandler; -import net.sourceforge.filebot.ui.transfer.TransferablePolicy; -import net.sourceforge.filebot.util.ui.DefaultFancyListCellRenderer; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.ui.transfer.DefaultTransferHandler; +import net.filebot.ui.transfer.TextFileExportHandler; +import net.filebot.ui.transfer.TransferablePolicy; +import net.filebot.util.ui.DefaultFancyListCellRenderer; +import net.filebot.util.ui.TunedUtilities; import ca.odell.glazedlists.BasicEventList; import ca.odell.glazedlists.EventList; import ca.odell.glazedlists.swing.EventListModel; diff --git a/source/net/filebot/ui/FileBotListExportHandler.java b/source/net/filebot/ui/FileBotListExportHandler.java index 3c3cbdc7..5e5ed863 100644 --- a/source/net/filebot/ui/FileBotListExportHandler.java +++ b/source/net/filebot/ui/FileBotListExportHandler.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.io.PrintWriter; -import net.sourceforge.filebot.ui.transfer.TextFileExportHandler; +import net.filebot.ui.transfer.TextFileExportHandler; public class FileBotListExportHandler extends TextFileExportHandler { diff --git a/source/net/filebot/ui/FileBotTab.java b/source/net/filebot/ui/FileBotTab.java index 34b3164c..c63eb15e 100644 --- a/source/net/filebot/ui/FileBotTab.java +++ b/source/net/filebot/ui/FileBotTab.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.BorderLayout; diff --git a/source/net/filebot/ui/FileBotTabComponent.java b/source/net/filebot/ui/FileBotTabComponent.java index e6cd9a40..41b6b339 100644 --- a/source/net/filebot/ui/FileBotTabComponent.java +++ b/source/net/filebot/ui/FileBotTabComponent.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.Dimension; @@ -12,9 +12,9 @@ import javax.swing.JLabel; import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ui.ProgressIndicator; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.ResourceManager; +import net.filebot.util.ui.ProgressIndicator; +import net.filebot.util.ui.TunedUtilities; public class FileBotTabComponent extends JComponent { diff --git a/source/net/filebot/ui/HeaderPanel.java b/source/net/filebot/ui/HeaderPanel.java index c863ada5..cf41437e 100644 --- a/source/net/filebot/ui/HeaderPanel.java +++ b/source/net/filebot/ui/HeaderPanel.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.BorderLayout; @@ -15,10 +15,10 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ui.GradientStyle; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder.Position; +import net.filebot.ResourceManager; +import net.filebot.util.ui.GradientStyle; +import net.filebot.util.ui.notification.SeparatorBorder; +import net.filebot.util.ui.notification.SeparatorBorder.Position; class HeaderPanel extends JComponent { diff --git a/source/net/filebot/ui/HistoryPanel.java b/source/net/filebot/ui/HistoryPanel.java index 7cf486eb..23b857f0 100644 --- a/source/net/filebot/ui/HistoryPanel.java +++ b/source/net/filebot/ui/HistoryPanel.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.Color; @@ -15,7 +15,7 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.util.ui.LinkButton; +import net.filebot.util.ui.LinkButton; public class HistoryPanel extends JPanel { diff --git a/source/net/filebot/ui/LanguageComboBox.java b/source/net/filebot/ui/LanguageComboBox.java index 1a59ecc0..1fc20c35 100644 --- a/source/net/filebot/ui/LanguageComboBox.java +++ b/source/net/filebot/ui/LanguageComboBox.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import static java.awt.event.ItemEvent.*; -import static net.sourceforge.filebot.Language.*; +import static net.filebot.Language.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -16,8 +16,8 @@ import javax.swing.JComboBox; import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.Settings; +import net.filebot.Language; +import net.filebot.Settings; public class LanguageComboBox extends JComboBox { diff --git a/source/net/filebot/ui/LanguageComboBoxCellRenderer.java b/source/net/filebot/ui/LanguageComboBoxCellRenderer.java index ef8d99c6..f88899ef 100644 --- a/source/net/filebot/ui/LanguageComboBoxCellRenderer.java +++ b/source/net/filebot/ui/LanguageComboBoxCellRenderer.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.Color; import java.awt.Component; @@ -10,9 +10,9 @@ import javax.swing.border.Border; import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ui.DashedSeparator; +import net.filebot.Language; +import net.filebot.ResourceManager; +import net.filebot.util.ui.DashedSeparator; public class LanguageComboBoxCellRenderer implements ListCellRenderer { diff --git a/source/net/filebot/ui/LanguageComboBoxModel.java b/source/net/filebot/ui/LanguageComboBoxModel.java index 903b5846..c1322cfa 100644 --- a/source/net/filebot/ui/LanguageComboBoxModel.java +++ b/source/net/filebot/ui/LanguageComboBoxModel.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; -import static net.sourceforge.filebot.Language.*; +import static net.filebot.Language.*; import java.util.AbstractList; import java.util.ArrayList; @@ -10,7 +10,7 @@ import java.util.Set; import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; -import net.sourceforge.filebot.Language; +import net.filebot.Language; public class LanguageComboBoxModel extends AbstractListModel implements ComboBoxModel { diff --git a/source/net/filebot/ui/MainFrame.java b/source/net/filebot/ui/MainFrame.java index f6e185e9..b0f436a2 100644 --- a/source/net/filebot/ui/MainFrame.java +++ b/source/net/filebot/ui/MainFrame.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import static java.awt.event.InputEvent.*; import static java.awt.event.KeyEvent.*; import static javax.swing.KeyStroke.*; import static javax.swing.ScrollPaneConstants.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; +import static net.filebot.ui.NotificationLogging.*; import java.awt.Color; import java.awt.Cursor; @@ -41,20 +41,20 @@ import javax.swing.event.ListSelectionListener; import net.miginfocom.swing.MigLayout; import net.sf.ehcache.CacheManager; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.cli.GroovyPad; -import net.sourceforge.filebot.ui.analyze.AnalyzePanelBuilder; -import net.sourceforge.filebot.ui.episodelist.EpisodeListPanelBuilder; -import net.sourceforge.filebot.ui.list.ListPanelBuilder; -import net.sourceforge.filebot.ui.rename.RenamePanelBuilder; -import net.sourceforge.filebot.ui.sfv.SfvPanelBuilder; -import net.sourceforge.filebot.ui.subtitle.SubtitlePanelBuilder; -import net.sourceforge.filebot.util.PreferencesMap.PreferencesEntry; -import net.sourceforge.filebot.util.ui.DefaultFancyListCellRenderer; -import net.sourceforge.filebot.util.ui.ShadowBorder; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.Analytics; +import net.filebot.ResourceManager; +import net.filebot.Settings; +import net.filebot.cli.GroovyPad; +import net.filebot.ui.analyze.AnalyzePanelBuilder; +import net.filebot.ui.episodelist.EpisodeListPanelBuilder; +import net.filebot.ui.list.ListPanelBuilder; +import net.filebot.ui.rename.RenamePanelBuilder; +import net.filebot.ui.sfv.SfvPanelBuilder; +import net.filebot.ui.subtitle.SubtitlePanelBuilder; +import net.filebot.util.PreferencesMap.PreferencesEntry; +import net.filebot.util.ui.DefaultFancyListCellRenderer; +import net.filebot.util.ui.ShadowBorder; +import net.filebot.util.ui.TunedUtilities; public class MainFrame extends JFrame { diff --git a/source/net/filebot/ui/NotificationLogging.java b/source/net/filebot/ui/NotificationLogging.java index e2db10bc..4dbeb1f1 100644 --- a/source/net/filebot/ui/NotificationLogging.java +++ b/source/net/filebot/ui/NotificationLogging.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.util.ui.notification.Direction.*; +import static net.filebot.Settings.*; +import static net.filebot.util.ui.notification.Direction.*; import java.awt.GraphicsEnvironment; import java.util.logging.ConsoleHandler; @@ -15,16 +15,16 @@ import java.util.logging.Logger; import javax.swing.Icon; import javax.swing.SwingUtilities; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.ui.notification.MessageNotification; -import net.sourceforge.filebot.util.ui.notification.NotificationManager; -import net.sourceforge.filebot.util.ui.notification.QueueNotificationLayout; +import net.filebot.ResourceManager; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.ui.notification.MessageNotification; +import net.filebot.util.ui.notification.NotificationManager; +import net.filebot.util.ui.notification.QueueNotificationLayout; public class NotificationLogging extends Handler { - public static final Logger UILogger = createNotificationLogger("net.sourceforge.filebot.logger.ui"); + public static final Logger UILogger = createNotificationLogger("net.filebot.logger.ui"); private static Logger createNotificationLogger(String name) { diff --git a/source/net/filebot/ui/PanelBuilder.java b/source/net/filebot/ui/PanelBuilder.java index ec2774e2..b5c1642d 100644 --- a/source/net/filebot/ui/PanelBuilder.java +++ b/source/net/filebot/ui/PanelBuilder.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import javax.swing.Icon; diff --git a/source/net/filebot/ui/SelectButtonTextField.java b/source/net/filebot/ui/SelectButtonTextField.java index 7911de6b..d7d3ae26 100644 --- a/source/net/filebot/ui/SelectButtonTextField.java +++ b/source/net/filebot/ui/SelectButtonTextField.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.Component; import java.awt.Rectangle; @@ -28,9 +28,9 @@ import javax.swing.plaf.basic.ComboPopup; import javax.swing.text.JTextComponent; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ui.SelectButton; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.ResourceManager; +import net.filebot.util.ui.SelectButton; +import net.filebot.util.ui.TunedUtilities; public class SelectButtonTextField extends JComponent { diff --git a/source/net/filebot/ui/SelectDialog.java b/source/net/filebot/ui/SelectDialog.java index 53dbf1af..78d6146a 100644 --- a/source/net/filebot/ui/SelectDialog.java +++ b/source/net/filebot/ui/SelectDialog.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Component; import java.awt.Dimension; @@ -25,9 +25,9 @@ import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ui.DefaultFancyListCellRenderer; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.ResourceManager; +import net.filebot.util.ui.DefaultFancyListCellRenderer; +import net.filebot.util.ui.TunedUtilities; public class SelectDialog extends JDialog { diff --git a/source/net/filebot/ui/SinglePanelFrame.java b/source/net/filebot/ui/SinglePanelFrame.java index 9cbbb7d0..93dfc08a 100644 --- a/source/net/filebot/ui/SinglePanelFrame.java +++ b/source/net/filebot/ui/SinglePanelFrame.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui; +package net.filebot.ui; import java.awt.Image; @@ -11,10 +11,10 @@ import javax.swing.JComponent; import javax.swing.JFrame; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.transfer.TransferablePolicy; -import net.sourceforge.filebot.ui.transfer.TransferablePolicy.TransferAction; -import net.sourceforge.filebot.util.ExceptionUtilities; +import net.filebot.ResourceManager; +import net.filebot.ui.transfer.TransferablePolicy; +import net.filebot.ui.transfer.TransferablePolicy.TransferAction; +import net.filebot.util.ExceptionUtilities; public class SinglePanelFrame extends JFrame { diff --git a/source/net/filebot/ui/analyze/AnalyzePanel.java b/source/net/filebot/ui/analyze/AnalyzePanel.java index 973b7346..b729d20d 100644 --- a/source/net/filebot/ui/analyze/AnalyzePanel.java +++ b/source/net/filebot/ui/analyze/AnalyzePanel.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/source/net/filebot/ui/analyze/AnalyzePanelBuilder.java b/source/net/filebot/ui/analyze/AnalyzePanelBuilder.java index 8fae6066..54502625 100644 --- a/source/net/filebot/ui/analyze/AnalyzePanelBuilder.java +++ b/source/net/filebot/ui/analyze/AnalyzePanelBuilder.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; import javax.swing.Icon; import javax.swing.JComponent; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.PanelBuilder; +import net.filebot.ResourceManager; +import net.filebot.ui.PanelBuilder; public class AnalyzePanelBuilder implements PanelBuilder { diff --git a/source/net/filebot/ui/analyze/AttributeTool.java b/source/net/filebot/ui/analyze/AttributeTool.java index 4fe94e2d..2006d7b0 100644 --- a/source/net/filebot/ui/analyze/AttributeTool.java +++ b/source/net/filebot/ui/analyze/AttributeTool.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; -import static net.sourceforge.filebot.MediaTypes.*; +import static net.filebot.MediaTypes.*; import java.awt.Color; import java.io.File; @@ -17,12 +17,12 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.TableModel; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.media.MetaAttributes; -import net.sourceforge.filebot.ui.analyze.FileTree.FolderNode; -import net.sourceforge.filebot.util.ui.LoadingOverlayPane; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.SearchResult; +import net.filebot.media.MetaAttributes; +import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.util.ui.LoadingOverlayPane; +import net.filebot.web.Episode; +import net.filebot.web.Movie; +import net.filebot.web.SearchResult; class AttributeTool extends Tool { diff --git a/source/net/filebot/ui/analyze/ExtractTool.java b/source/net/filebot/ui/analyze/ExtractTool.java index 6cce9c39..09865230 100644 --- a/source/net/filebot/ui/analyze/ExtractTool.java +++ b/source/net/filebot/ui/analyze/ExtractTool.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.ExceptionUtilities.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.ExceptionUtilities.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Window; @@ -32,18 +32,18 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.TableModel; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.archive.Archive; -import net.sourceforge.filebot.archive.FileMapper; -import net.sourceforge.filebot.ui.analyze.FileTree.FolderNode; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.GradientStyle; -import net.sourceforge.filebot.util.ui.LoadingOverlayPane; -import net.sourceforge.filebot.util.ui.ProgressDialog; -import net.sourceforge.filebot.util.ui.ProgressDialog.Cancellable; -import net.sourceforge.filebot.util.ui.SwingWorkerPropertyChangeAdapter; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder; -import net.sourceforge.filebot.vfs.FileInfo; +import net.filebot.ResourceManager; +import net.filebot.archive.Archive; +import net.filebot.archive.FileMapper; +import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.GradientStyle; +import net.filebot.util.ui.LoadingOverlayPane; +import net.filebot.util.ui.ProgressDialog; +import net.filebot.util.ui.ProgressDialog.Cancellable; +import net.filebot.util.ui.SwingWorkerPropertyChangeAdapter; +import net.filebot.util.ui.notification.SeparatorBorder; +import net.filebot.vfs.FileInfo; class ExtractTool extends Tool { diff --git a/source/net/filebot/ui/analyze/FileTree.java b/source/net/filebot/ui/analyze/FileTree.java index 92db5254..4f678c2d 100644 --- a/source/net/filebot/ui/analyze/FileTree.java +++ b/source/net/filebot/ui/analyze/FileTree.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; -import static net.sourceforge.filebot.ui.NotificationLogging.*; +import static net.filebot.ui.NotificationLogging.*; import java.awt.Desktop; import java.awt.Font; @@ -31,10 +31,10 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.FilterIterator; -import net.sourceforge.filebot.util.TreeIterator; +import net.filebot.ResourceManager; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.FilterIterator; +import net.filebot.util.TreeIterator; public class FileTree extends JTree { diff --git a/source/net/filebot/ui/analyze/FileTreeCellRenderer.java b/source/net/filebot/ui/analyze/FileTreeCellRenderer.java index 2cd34b22..2a5858d9 100644 --- a/source/net/filebot/ui/analyze/FileTreeCellRenderer.java +++ b/source/net/filebot/ui/analyze/FileTreeCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; import java.awt.Component; @@ -7,9 +7,9 @@ import java.awt.Component; import javax.swing.JTree; import javax.swing.tree.TreeNode; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ui.FancyTreeCellRenderer; -import net.sourceforge.filebot.util.ui.GradientStyle; +import net.filebot.ResourceManager; +import net.filebot.util.ui.FancyTreeCellRenderer; +import net.filebot.util.ui.GradientStyle; public class FileTreeCellRenderer extends FancyTreeCellRenderer { diff --git a/source/net/filebot/ui/analyze/FileTreeExportHandler.java b/source/net/filebot/ui/analyze/FileTreeExportHandler.java index 868ef610..1a0d16e5 100644 --- a/source/net/filebot/ui/analyze/FileTreeExportHandler.java +++ b/source/net/filebot/ui/analyze/FileTreeExportHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; import java.awt.datatransfer.Transferable; @@ -12,10 +12,10 @@ import javax.swing.TransferHandler; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import net.sourceforge.filebot.ui.analyze.FileTree.FileNode; -import net.sourceforge.filebot.ui.analyze.FileTree.FolderNode; -import net.sourceforge.filebot.ui.transfer.FileTransferable; -import net.sourceforge.filebot.ui.transfer.TransferableExportHandler; +import net.filebot.ui.analyze.FileTree.FileNode; +import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.transfer.FileTransferable; +import net.filebot.ui.transfer.TransferableExportHandler; class FileTreeExportHandler implements TransferableExportHandler { diff --git a/source/net/filebot/ui/analyze/FileTreePanel.java b/source/net/filebot/ui/analyze/FileTreePanel.java index aeace0e1..37743ac7 100644 --- a/source/net/filebot/ui/analyze/FileTreePanel.java +++ b/source/net/filebot/ui/analyze/FileTreePanel.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; -import static net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy.*; +import static net.filebot.ui.transfer.BackgroundFileTransferablePolicy.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -17,11 +17,11 @@ import javax.swing.JScrollPane; import javax.swing.KeyStroke; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.transfer.DefaultTransferHandler; -import net.sourceforge.filebot.ui.transfer.LoadAction; -import net.sourceforge.filebot.util.ui.LoadingOverlayPane; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.ResourceManager; +import net.filebot.ui.transfer.DefaultTransferHandler; +import net.filebot.ui.transfer.LoadAction; +import net.filebot.util.ui.LoadingOverlayPane; +import net.filebot.util.ui.TunedUtilities; class FileTreePanel extends JComponent { diff --git a/source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java b/source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java index 1aa1e926..d0492e8a 100644 --- a/source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java +++ b/source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java @@ -1,20 +1,20 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; -import static net.sourceforge.filebot.ui.NotificationLogging.*; +import static net.filebot.ui.NotificationLogging.*; import java.io.File; import java.util.List; import java.util.logging.Level; -import net.sourceforge.filebot.ui.analyze.FileTree.AbstractTreeNode; -import net.sourceforge.filebot.ui.analyze.FileTree.FileNode; -import net.sourceforge.filebot.ui.analyze.FileTree.FolderNode; -import net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.FastFile; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.ui.analyze.FileTree.AbstractTreeNode; +import net.filebot.ui.analyze.FileTree.FileNode; +import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.transfer.BackgroundFileTransferablePolicy; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.FastFile; +import net.filebot.util.FileUtilities; class FileTreeTransferablePolicy extends BackgroundFileTransferablePolicy { diff --git a/source/net/filebot/ui/analyze/SplitTool.java b/source/net/filebot/ui/analyze/SplitTool.java index 196efe0d..ef036cdc 100644 --- a/source/net/filebot/ui/analyze/SplitTool.java +++ b/source/net/filebot/ui/analyze/SplitTool.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; import java.awt.Color; @@ -20,12 +20,12 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ui.analyze.FileTree.FolderNode; -import net.sourceforge.filebot.ui.transfer.DefaultTransferHandler; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.GradientStyle; -import net.sourceforge.filebot.util.ui.LoadingOverlayPane; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder; +import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.transfer.DefaultTransferHandler; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.GradientStyle; +import net.filebot.util.ui.LoadingOverlayPane; +import net.filebot.util.ui.notification.SeparatorBorder; class SplitTool extends Tool implements ChangeListener { diff --git a/source/net/filebot/ui/analyze/Tool.java b/source/net/filebot/ui/analyze/Tool.java index 39bed7ae..6baefdc8 100644 --- a/source/net/filebot/ui/analyze/Tool.java +++ b/source/net/filebot/ui/analyze/Tool.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; import java.io.File; @@ -11,11 +11,11 @@ import java.util.logging.Logger; import javax.swing.JComponent; import javax.swing.SwingWorker; -import net.sourceforge.filebot.ui.analyze.FileTree.FileNode; -import net.sourceforge.filebot.ui.analyze.FileTree.FolderNode; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.LoadingOverlayPane; +import net.filebot.ui.analyze.FileTree.FileNode; +import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.LoadingOverlayPane; abstract class Tool extends JComponent { diff --git a/source/net/filebot/ui/analyze/TypeTool.java b/source/net/filebot/ui/analyze/TypeTool.java index e47dc042..7703d02d 100644 --- a/source/net/filebot/ui/analyze/TypeTool.java +++ b/source/net/filebot/ui/analyze/TypeTool.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.analyze; +package net.filebot.ui.analyze; import java.io.File; @@ -17,10 +17,10 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ui.analyze.FileTree.FolderNode; -import net.sourceforge.filebot.ui.transfer.DefaultTransferHandler; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.LoadingOverlayPane; +import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.transfer.DefaultTransferHandler; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.LoadingOverlayPane; class TypeTool extends Tool { diff --git a/source/net/filebot/ui/episodelist/EpisodeListPanel.java b/source/net/filebot/ui/episodelist/EpisodeListPanel.java index cac4c64e..06ff86bb 100644 --- a/source/net/filebot/ui/episodelist/EpisodeListPanel.java +++ b/source/net/filebot/ui/episodelist/EpisodeListPanel.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.ui.episodelist; +package net.filebot.ui.episodelist; -import static net.sourceforge.filebot.ui.episodelist.SeasonSpinnerModel.*; -import static net.sourceforge.filebot.web.EpisodeUtilities.*; +import static net.filebot.ui.episodelist.SeasonSpinnerModel.*; +import static net.filebot.web.EpisodeUtilities.*; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; @@ -26,32 +26,32 @@ import javax.swing.JComponent; import javax.swing.JSpinner; import javax.swing.KeyStroke; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.similarity.Normalization; -import net.sourceforge.filebot.ui.AbstractSearchPanel; -import net.sourceforge.filebot.ui.FileBotList; -import net.sourceforge.filebot.ui.FileBotListExportHandler; -import net.sourceforge.filebot.ui.FileBotTab; -import net.sourceforge.filebot.ui.LanguageComboBox; -import net.sourceforge.filebot.ui.SelectDialog; -import net.sourceforge.filebot.ui.transfer.ArrayTransferable; -import net.sourceforge.filebot.ui.transfer.ClipboardHandler; -import net.sourceforge.filebot.ui.transfer.CompositeTranserable; -import net.sourceforge.filebot.ui.transfer.FileExportHandler; -import net.sourceforge.filebot.util.StringUtilities; -import net.sourceforge.filebot.util.ui.LabelProvider; -import net.sourceforge.filebot.util.ui.SelectButton; -import net.sourceforge.filebot.util.ui.SimpleLabelProvider; -import net.sourceforge.filebot.util.ui.TunedUtilities; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.EpisodeListProvider; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.SeasonOutOfBoundsException; -import net.sourceforge.filebot.web.SortOrder; +import net.filebot.Analytics; +import net.filebot.Language; +import net.filebot.Settings; +import net.filebot.WebServices; +import net.filebot.media.MediaDetection; +import net.filebot.similarity.Normalization; +import net.filebot.ui.AbstractSearchPanel; +import net.filebot.ui.FileBotList; +import net.filebot.ui.FileBotListExportHandler; +import net.filebot.ui.FileBotTab; +import net.filebot.ui.LanguageComboBox; +import net.filebot.ui.SelectDialog; +import net.filebot.ui.transfer.ArrayTransferable; +import net.filebot.ui.transfer.ClipboardHandler; +import net.filebot.ui.transfer.CompositeTranserable; +import net.filebot.ui.transfer.FileExportHandler; +import net.filebot.util.StringUtilities; +import net.filebot.util.ui.LabelProvider; +import net.filebot.util.ui.SelectButton; +import net.filebot.util.ui.SimpleLabelProvider; +import net.filebot.util.ui.TunedUtilities; +import net.filebot.web.Episode; +import net.filebot.web.EpisodeListProvider; +import net.filebot.web.SearchResult; +import net.filebot.web.SeasonOutOfBoundsException; +import net.filebot.web.SortOrder; public class EpisodeListPanel extends AbstractSearchPanel { diff --git a/source/net/filebot/ui/episodelist/EpisodeListPanelBuilder.java b/source/net/filebot/ui/episodelist/EpisodeListPanelBuilder.java index 15cf6f87..6885364a 100644 --- a/source/net/filebot/ui/episodelist/EpisodeListPanelBuilder.java +++ b/source/net/filebot/ui/episodelist/EpisodeListPanelBuilder.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.episodelist; +package net.filebot.ui.episodelist; import javax.swing.Icon; import javax.swing.JComponent; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.PanelBuilder; +import net.filebot.ResourceManager; +import net.filebot.ui.PanelBuilder; public class EpisodeListPanelBuilder implements PanelBuilder { diff --git a/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java b/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java index 2df97175..6657edc2 100644 --- a/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java +++ b/source/net/filebot/ui/episodelist/SeasonSpinnerEditor.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.episodelist; +package net.filebot.ui.episodelist; -import static net.sourceforge.filebot.ui.episodelist.SeasonSpinnerModel.*; +import static net.filebot.ui.episodelist.SeasonSpinnerModel.*; import java.awt.Color; import java.text.ParseException; diff --git a/source/net/filebot/ui/episodelist/SeasonSpinnerModel.java b/source/net/filebot/ui/episodelist/SeasonSpinnerModel.java index 40c986e7..5bd70ce3 100644 --- a/source/net/filebot/ui/episodelist/SeasonSpinnerModel.java +++ b/source/net/filebot/ui/episodelist/SeasonSpinnerModel.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.episodelist; +package net.filebot.ui.episodelist; import javax.swing.SpinnerNumberModel; diff --git a/source/net/filebot/ui/list/FileListTransferablePolicy.java b/source/net/filebot/ui/list/FileListTransferablePolicy.java index 89658dce..4bab897e 100644 --- a/source/net/filebot/ui/list/FileListTransferablePolicy.java +++ b/source/net/filebot/ui/list/FileListTransferablePolicy.java @@ -1,17 +1,17 @@ -package net.sourceforge.filebot.ui.list; +package net.filebot.ui.list; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.torrent.Torrent; -import net.sourceforge.filebot.ui.FileBotList; -import net.sourceforge.filebot.ui.transfer.FileTransferablePolicy; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.MediaTypes; +import net.filebot.torrent.Torrent; +import net.filebot.ui.FileBotList; +import net.filebot.ui.transfer.FileTransferablePolicy; +import net.filebot.util.FileUtilities; class FileListTransferablePolicy extends FileTransferablePolicy { diff --git a/source/net/filebot/ui/list/ListPanel.java b/source/net/filebot/ui/list/ListPanel.java index 81588327..b6d4bfad 100644 --- a/source/net/filebot/ui/list/ListPanel.java +++ b/source/net/filebot/ui/list/ListPanel.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui.list; +package net.filebot.ui.list; import static java.awt.Font.*; import static java.lang.Math.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; +import static net.filebot.ui.NotificationLogging.*; import java.awt.BorderLayout; import java.awt.Font; @@ -31,14 +31,14 @@ import javax.swing.KeyStroke; import javax.swing.SpinnerNumberModel; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.format.ExpressionFormat; -import net.sourceforge.filebot.similarity.SeriesNameMatcher; -import net.sourceforge.filebot.ui.FileBotList; -import net.sourceforge.filebot.ui.FileBotListExportHandler; -import net.sourceforge.filebot.ui.transfer.LoadAction; -import net.sourceforge.filebot.ui.transfer.SaveAction; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.format.ExpressionFormat; +import net.filebot.similarity.SeriesNameMatcher; +import net.filebot.ui.FileBotList; +import net.filebot.ui.FileBotListExportHandler; +import net.filebot.ui.transfer.LoadAction; +import net.filebot.ui.transfer.SaveAction; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.ui.TunedUtilities; public class ListPanel extends JComponent { diff --git a/source/net/filebot/ui/list/ListPanelBuilder.java b/source/net/filebot/ui/list/ListPanelBuilder.java index 20ae5c10..512fb847 100644 --- a/source/net/filebot/ui/list/ListPanelBuilder.java +++ b/source/net/filebot/ui/list/ListPanelBuilder.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.list; +package net.filebot.ui.list; import javax.swing.Icon; import javax.swing.JComponent; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.PanelBuilder; +import net.filebot.ResourceManager; +import net.filebot.ui.PanelBuilder; public class ListPanelBuilder implements PanelBuilder { diff --git a/source/net/filebot/ui/rename/AudioFingerprintMatcher.java b/source/net/filebot/ui/rename/AudioFingerprintMatcher.java index a92f38b2..798c0977 100644 --- a/source/net/filebot/ui/rename/AudioFingerprintMatcher.java +++ b/source/net/filebot/ui/rename/AudioFingerprintMatcher.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.util.FileUtilities.*; import java.awt.Component; import java.io.File; @@ -12,11 +12,11 @@ import java.util.List; import java.util.Locale; import java.util.Map.Entry; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.web.AudioTrack; -import net.sourceforge.filebot.web.ID3Lookup; -import net.sourceforge.filebot.web.MusicIdentificationService; -import net.sourceforge.filebot.web.SortOrder; +import net.filebot.similarity.Match; +import net.filebot.web.AudioTrack; +import net.filebot.web.ID3Lookup; +import net.filebot.web.MusicIdentificationService; +import net.filebot.web.SortOrder; class AudioFingerprintMatcher implements AutoCompleteMatcher { diff --git a/source/net/filebot/ui/rename/AutoCompleteMatcher.java b/source/net/filebot/ui/rename/AutoCompleteMatcher.java index c8bb5a53..8f683d40 100644 --- a/source/net/filebot/ui/rename/AutoCompleteMatcher.java +++ b/source/net/filebot/ui/rename/AutoCompleteMatcher.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.awt.Component; @@ -7,8 +7,8 @@ import java.io.File; import java.util.List; import java.util.Locale; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.web.SortOrder; +import net.filebot.similarity.Match; +import net.filebot.web.SortOrder; interface AutoCompleteMatcher { diff --git a/source/net/filebot/ui/rename/BindingDialog.java b/source/net/filebot/ui/rename/BindingDialog.java index 3ea1ce17..87d16bd5 100644 --- a/source/net/filebot/ui/rename/BindingDialog.java +++ b/source/net/filebot/ui/rename/BindingDialog.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.Settings.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; @@ -53,16 +53,16 @@ import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.format.ExpressionFormat; -import net.sourceforge.filebot.format.MediaBindingBean; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.media.MetaAttributes; -import net.sourceforge.filebot.mediainfo.MediaInfo; -import net.sourceforge.filebot.mediainfo.MediaInfo.StreamKind; -import net.sourceforge.filebot.mediainfo.MediaInfoException; -import net.sourceforge.filebot.util.DefaultThreadFactory; -import net.sourceforge.filebot.util.ui.LazyDocumentListener; +import net.filebot.ResourceManager; +import net.filebot.format.ExpressionFormat; +import net.filebot.format.MediaBindingBean; +import net.filebot.media.MediaDetection; +import net.filebot.media.MetaAttributes; +import net.filebot.mediainfo.MediaInfo; +import net.filebot.mediainfo.MediaInfo.StreamKind; +import net.filebot.mediainfo.MediaInfoException; +import net.filebot.util.DefaultThreadFactory; +import net.filebot.util.ui.LazyDocumentListener; class BindingDialog extends JDialog { diff --git a/source/net/filebot/ui/rename/CharacterHighlightPainter.java b/source/net/filebot/ui/rename/CharacterHighlightPainter.java index 47c6d296..d0c7df7d 100644 --- a/source/net/filebot/ui/rename/CharacterHighlightPainter.java +++ b/source/net/filebot/ui/rename/CharacterHighlightPainter.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.awt.Color; @@ -17,7 +17,7 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Highlighter; import javax.swing.text.JTextComponent; -import net.sourceforge.filebot.util.ui.GradientStyle; +import net.filebot.util.ui.GradientStyle; class CharacterHighlightPainter implements Highlighter.HighlightPainter { diff --git a/source/net/filebot/ui/rename/EpisodeListMatcher.java b/source/net/filebot/ui/rename/EpisodeListMatcher.java index b7e1475a..6ba80ddf 100644 --- a/source/net/filebot/ui/rename/EpisodeListMatcher.java +++ b/source/net/filebot/ui/rename/EpisodeListMatcher.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.util.Collections.*; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.media.MediaDetection.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.StringUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.Settings.*; +import static net.filebot.media.MediaDetection.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.StringUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Component; import java.awt.Dimension; @@ -35,16 +35,16 @@ import java.util.concurrent.RunnableFuture; import javax.swing.Action; import javax.swing.SwingUtilities; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.similarity.CommonSequenceMatcher; -import net.sourceforge.filebot.similarity.EpisodeMatcher; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.ui.SelectDialog; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.EpisodeListProvider; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.SortOrder; +import net.filebot.Analytics; +import net.filebot.Settings; +import net.filebot.similarity.CommonSequenceMatcher; +import net.filebot.similarity.EpisodeMatcher; +import net.filebot.similarity.Match; +import net.filebot.ui.SelectDialog; +import net.filebot.web.Episode; +import net.filebot.web.EpisodeListProvider; +import net.filebot.web.SearchResult; +import net.filebot.web.SortOrder; class EpisodeListMatcher implements AutoCompleteMatcher { diff --git a/source/net/filebot/ui/rename/ExpressionFormatter.java b/source/net/filebot/ui/rename/ExpressionFormatter.java index a6393790..658b544d 100644 --- a/source/net/filebot/ui/rename/ExpressionFormatter.java +++ b/source/net/filebot/ui/rename/ExpressionFormatter.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.io.File; @@ -8,9 +8,9 @@ import java.util.Map; import javax.script.ScriptException; -import net.sourceforge.filebot.format.ExpressionFormat; -import net.sourceforge.filebot.format.MediaBindingBean; -import net.sourceforge.filebot.similarity.Match; +import net.filebot.format.ExpressionFormat; +import net.filebot.format.MediaBindingBean; +import net.filebot.similarity.Match; class ExpressionFormatter implements MatchFormatter { diff --git a/source/net/filebot/ui/rename/FileNameFormatter.java b/source/net/filebot/ui/rename/FileNameFormatter.java index 19709330..331a2c73 100644 --- a/source/net/filebot/ui/rename/FileNameFormatter.java +++ b/source/net/filebot/ui/rename/FileNameFormatter.java @@ -1,13 +1,13 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.io.File; import java.util.Map; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.vfs.FileInfo; +import net.filebot.similarity.Match; +import net.filebot.util.FileUtilities; +import net.filebot.vfs.FileInfo; class FileNameFormatter implements MatchFormatter { diff --git a/source/net/filebot/ui/rename/FilesListTransferablePolicy.java b/source/net/filebot/ui/rename/FilesListTransferablePolicy.java index c75cbecd..f2d619c8 100644 --- a/source/net/filebot/ui/rename/FilesListTransferablePolicy.java +++ b/source/net/filebot/ui/rename/FilesListTransferablePolicy.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.util.Arrays.*; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.ui.transfer.FileTransferable.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.ui.transfer.FileTransferable.*; +import static net.filebot.util.FileUtilities.*; import java.awt.datatransfer.Transferable; import java.io.File; @@ -15,9 +15,9 @@ import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.ui.transfer.FileTransferablePolicy; -import net.sourceforge.filebot.util.FastFile; +import net.filebot.media.MediaDetection; +import net.filebot.ui.transfer.FileTransferablePolicy; +import net.filebot.util.FastFile; class FilesListTransferablePolicy extends FileTransferablePolicy { diff --git a/source/net/filebot/ui/rename/FormatDialog.java b/source/net/filebot/ui/rename/FormatDialog.java index baf172dc..881eebd2 100644 --- a/source/net/filebot/ui/rename/FormatDialog.java +++ b/source/net/filebot/ui/rename/FormatDialog.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.awt.Font.*; import static javax.swing.BorderFactory.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.ExceptionUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.ExceptionUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; @@ -59,25 +59,25 @@ import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.format.BindingException; -import net.sourceforge.filebot.format.ExpressionFormat; -import net.sourceforge.filebot.format.MediaBindingBean; -import net.sourceforge.filebot.util.DefaultThreadFactory; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.PreferencesList; -import net.sourceforge.filebot.util.PreferencesMap.PreferencesEntry; -import net.sourceforge.filebot.util.ui.GradientStyle; -import net.sourceforge.filebot.util.ui.LazyDocumentListener; -import net.sourceforge.filebot.util.ui.LinkButton; -import net.sourceforge.filebot.util.ui.ProgressIndicator; -import net.sourceforge.filebot.util.ui.TunedUtilities; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder.Position; -import net.sourceforge.filebot.web.AudioTrackFormat; -import net.sourceforge.filebot.web.EpisodeFormat; -import net.sourceforge.filebot.web.MovieFormat; +import net.filebot.ResourceManager; +import net.filebot.Settings; +import net.filebot.format.BindingException; +import net.filebot.format.ExpressionFormat; +import net.filebot.format.MediaBindingBean; +import net.filebot.util.DefaultThreadFactory; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.PreferencesList; +import net.filebot.util.PreferencesMap.PreferencesEntry; +import net.filebot.util.ui.GradientStyle; +import net.filebot.util.ui.LazyDocumentListener; +import net.filebot.util.ui.LinkButton; +import net.filebot.util.ui.ProgressIndicator; +import net.filebot.util.ui.TunedUtilities; +import net.filebot.util.ui.notification.SeparatorBorder; +import net.filebot.util.ui.notification.SeparatorBorder.Position; +import net.filebot.web.AudioTrackFormat; +import net.filebot.web.EpisodeFormat; +import net.filebot.web.MovieFormat; import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; diff --git a/source/net/filebot/ui/rename/HighlightListCellRenderer.java b/source/net/filebot/ui/rename/HighlightListCellRenderer.java index 8d508c86..583feb98 100644 --- a/source/net/filebot/ui/rename/HighlightListCellRenderer.java +++ b/source/net/filebot/ui/rename/HighlightListCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.awt.BorderLayout; @@ -19,8 +19,8 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Highlighter; import javax.swing.text.JTextComponent; -import net.sourceforge.filebot.util.ui.AbstractFancyListCellRenderer; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.util.ui.AbstractFancyListCellRenderer; +import net.filebot.util.ui.TunedUtilities; class HighlightListCellRenderer extends AbstractFancyListCellRenderer { diff --git a/source/net/filebot/ui/rename/HistoryDialog.java b/source/net/filebot/ui/rename/HistoryDialog.java index aeea8b1f..80b0ec26 100644 --- a/source/net/filebot/ui/rename/HistoryDialog.java +++ b/source/net/filebot/ui/rename/HistoryDialog.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.awt.Font.*; import static java.util.Collections.*; import static java.util.regex.Pattern.*; import static javax.swing.JOptionPane.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.awt.Color; import java.awt.Component; @@ -64,21 +64,21 @@ import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.History; -import net.sourceforge.filebot.History.Element; -import net.sourceforge.filebot.History.Sequence; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.transfer.FileExportHandler; -import net.sourceforge.filebot.ui.transfer.FileTransferablePolicy; -import net.sourceforge.filebot.ui.transfer.LoadAction; -import net.sourceforge.filebot.ui.transfer.SaveAction; -import net.sourceforge.filebot.ui.transfer.TransferablePolicy.TransferAction; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.FileUtilities.ExtensionFileFilter; -import net.sourceforge.filebot.util.ui.GradientStyle; -import net.sourceforge.filebot.util.ui.LazyDocumentListener; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder.Position; +import net.filebot.History; +import net.filebot.History.Element; +import net.filebot.History.Sequence; +import net.filebot.ResourceManager; +import net.filebot.ui.transfer.FileExportHandler; +import net.filebot.ui.transfer.FileTransferablePolicy; +import net.filebot.ui.transfer.LoadAction; +import net.filebot.ui.transfer.SaveAction; +import net.filebot.ui.transfer.TransferablePolicy.TransferAction; +import net.filebot.util.FileUtilities; +import net.filebot.util.FileUtilities.ExtensionFileFilter; +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; class HistoryDialog extends JDialog { diff --git a/source/net/filebot/ui/rename/MatchAction.java b/source/net/filebot/ui/rename/MatchAction.java index 3084a427..f3f38aba 100644 --- a/source/net/filebot/ui/rename/MatchAction.java +++ b/source/net/filebot/ui/rename/MatchAction.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Cursor; import java.awt.Window; @@ -17,14 +17,14 @@ import javax.swing.AbstractAction; import javax.swing.Icon; import javax.swing.SwingWorker; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.similarity.EpisodeMetrics; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.similarity.Matcher; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.util.ui.ProgressDialog; -import net.sourceforge.filebot.util.ui.ProgressDialog.Cancellable; -import net.sourceforge.filebot.util.ui.SwingWorkerPropertyChangeAdapter; +import net.filebot.ResourceManager; +import net.filebot.similarity.EpisodeMetrics; +import net.filebot.similarity.Match; +import net.filebot.similarity.Matcher; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.util.ui.ProgressDialog; +import net.filebot.util.ui.ProgressDialog.Cancellable; +import net.filebot.util.ui.SwingWorkerPropertyChangeAdapter; class MatchAction extends AbstractAction { diff --git a/source/net/filebot/ui/rename/MatchFormatter.java b/source/net/filebot/ui/rename/MatchFormatter.java index 1b612d80..b1f14c65 100644 --- a/source/net/filebot/ui/rename/MatchFormatter.java +++ b/source/net/filebot/ui/rename/MatchFormatter.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.util.Map; -import net.sourceforge.filebot.similarity.Match; +import net.filebot.similarity.Match; public interface MatchFormatter { diff --git a/source/net/filebot/ui/rename/MatchModel.java b/source/net/filebot/ui/rename/MatchModel.java index c312efcc..482115b5 100644 --- a/source/net/filebot/ui/rename/MatchModel.java +++ b/source/net/filebot/ui/rename/MatchModel.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.util.ArrayList; @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import net.sourceforge.filebot.similarity.Match; +import net.filebot.similarity.Match; import ca.odell.glazedlists.BasicEventList; import ca.odell.glazedlists.EventList; import ca.odell.glazedlists.TransformedList; diff --git a/source/net/filebot/ui/rename/MovieFormatter.java b/source/net/filebot/ui/rename/MovieFormatter.java index ecfe2893..ef9eeb60 100644 --- a/source/net/filebot/ui/rename/MovieFormatter.java +++ b/source/net/filebot/ui/rename/MovieFormatter.java @@ -1,14 +1,14 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.util.Formatter; import java.util.Map; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.web.MoviePart; +import net.filebot.similarity.Match; +import net.filebot.web.MoviePart; class MovieFormatter implements MatchFormatter { diff --git a/source/net/filebot/ui/rename/MovieHashMatcher.java b/source/net/filebot/ui/rename/MovieHashMatcher.java index 1397c8c7..a1e754ba 100644 --- a/source/net/filebot/ui/rename/MovieHashMatcher.java +++ b/source/net/filebot/ui/rename/MovieHashMatcher.java @@ -1,14 +1,14 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.awt.Cursor.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.media.MediaDetection.*; -import static net.sourceforge.filebot.similarity.CommonSequenceMatcher.*; -import static net.sourceforge.filebot.similarity.Normalization.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.Settings.*; +import static net.filebot.media.MediaDetection.*; +import static net.filebot.similarity.CommonSequenceMatcher.*; +import static net.filebot.similarity.Normalization.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Component; import java.awt.Dimension; @@ -43,18 +43,18 @@ import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.SwingUtilities; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.similarity.NameSimilarityMetric; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.ui.SelectDialog; -import net.sourceforge.filebot.util.FileUtilities.ParentFilter; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.MovieIdentificationService; -import net.sourceforge.filebot.web.MoviePart; -import net.sourceforge.filebot.web.SortOrder; +import net.filebot.Analytics; +import net.filebot.ResourceManager; +import net.filebot.Settings; +import net.filebot.similarity.Match; +import net.filebot.similarity.NameSimilarityMetric; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.ui.SelectDialog; +import net.filebot.util.FileUtilities.ParentFilter; +import net.filebot.web.Movie; +import net.filebot.web.MovieIdentificationService; +import net.filebot.web.MoviePart; +import net.filebot.web.SortOrder; class MovieHashMatcher implements AutoCompleteMatcher { diff --git a/source/net/filebot/ui/rename/NamesListTransferablePolicy.java b/source/net/filebot/ui/rename/NamesListTransferablePolicy.java index ce266a2b..d4be2e8e 100644 --- a/source/net/filebot/ui/rename/NamesListTransferablePolicy.java +++ b/source/net/filebot/ui/rename/NamesListTransferablePolicy.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.awt.datatransfer.DataFlavor.*; -import static net.sourceforge.filebot.hash.VerificationUtilities.*; -import static net.sourceforge.filebot.ui.transfer.FileTransferable.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.hash.VerificationUtilities.*; +import static net.filebot.ui.transfer.FileTransferable.*; +import static net.filebot.util.FileUtilities.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; @@ -14,15 +14,15 @@ import java.util.Arrays; import java.util.List; import java.util.Scanner; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.hash.VerificationFileReader; -import net.sourceforge.filebot.torrent.Torrent; -import net.sourceforge.filebot.ui.transfer.ArrayTransferable; -import net.sourceforge.filebot.ui.transfer.FileTransferablePolicy; -import net.sourceforge.filebot.util.FastFile; -import net.sourceforge.filebot.vfs.SimpleFileInfo; -import net.sourceforge.filebot.web.Episode; +import net.filebot.MediaTypes; +import net.filebot.hash.HashType; +import net.filebot.hash.VerificationFileReader; +import net.filebot.torrent.Torrent; +import net.filebot.ui.transfer.ArrayTransferable; +import net.filebot.ui.transfer.FileTransferablePolicy; +import net.filebot.util.FastFile; +import net.filebot.vfs.SimpleFileInfo; +import net.filebot.web.Episode; class NamesListTransferablePolicy extends FileTransferablePolicy { diff --git a/source/net/filebot/ui/rename/RenameAction.java b/source/net/filebot/ui/rename/RenameAction.java index d8c23155..1bfc37ec 100644 --- a/source/net/filebot/ui/rename/RenameAction.java +++ b/source/net/filebot/ui/rename/RenameAction.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.util.Collections.*; import static javax.swing.JOptionPane.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.ExceptionUtilities.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.ExceptionUtilities.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Cursor; import java.awt.Dimension; @@ -39,16 +39,16 @@ import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.SwingWorker; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.HistorySpooler; -import net.sourceforge.filebot.NativeRenameAction; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.StandardRenameAction; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.util.ui.ProgressDialog; -import net.sourceforge.filebot.util.ui.ProgressDialog.Cancellable; -import net.sourceforge.filebot.util.ui.SwingWorkerPropertyChangeAdapter; +import net.filebot.Analytics; +import net.filebot.HistorySpooler; +import net.filebot.NativeRenameAction; +import net.filebot.ResourceManager; +import net.filebot.StandardRenameAction; +import net.filebot.media.MediaDetection; +import net.filebot.similarity.Match; +import net.filebot.util.ui.ProgressDialog; +import net.filebot.util.ui.ProgressDialog.Cancellable; +import net.filebot.util.ui.SwingWorkerPropertyChangeAdapter; class RenameAction extends AbstractAction { @@ -277,14 +277,14 @@ class RenameAction extends AbstractAction { protected class RenameJob extends SwingWorker, Void> implements Cancellable { - protected final net.sourceforge.filebot.RenameAction action; + protected final net.filebot.RenameAction action; protected final Map renameMap; protected final Map renameLog; protected final Semaphore postprocess = new Semaphore(0); - public RenameJob(Map renameMap, net.sourceforge.filebot.RenameAction action) { + public RenameJob(Map renameMap, net.filebot.RenameAction action) { this.action = action; this.renameMap = synchronizedMap(renameMap); this.renameLog = synchronizedMap(new LinkedHashMap()); diff --git a/source/net/filebot/ui/rename/RenameList.java b/source/net/filebot/ui/rename/RenameList.java index 683309ed..687ddb50 100644 --- a/source/net/filebot/ui/rename/RenameList.java +++ b/source/net/filebot/ui/rename/RenameList.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.util.Collections.*; @@ -15,10 +15,10 @@ import javax.swing.JPanel; import javax.swing.ListSelectionModel; 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 net.filebot.ResourceManager; +import net.filebot.ui.FileBotList; +import net.filebot.ui.transfer.LoadAction; +import net.filebot.ui.transfer.TransferablePolicy; import ca.odell.glazedlists.EventList; diff --git a/source/net/filebot/ui/rename/RenameListCellRenderer.java b/source/net/filebot/ui/rename/RenameListCellRenderer.java index bba02124..e22635f9 100644 --- a/source/net/filebot/ui/rename/RenameListCellRenderer.java +++ b/source/net/filebot/ui/rename/RenameListCellRenderer.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; -import static net.sourceforge.filebot.similarity.EpisodeMetrics.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.similarity.EpisodeMetrics.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.AlphaComposite; import java.awt.Color; @@ -21,16 +21,16 @@ import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.similarity.MetricCascade; -import net.sourceforge.filebot.similarity.MetricMin; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.ui.rename.RenameModel.FormattedFuture; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.DefaultFancyListCellRenderer; -import net.sourceforge.filebot.util.ui.GradientStyle; -import net.sourceforge.filebot.web.Episode; +import net.filebot.ResourceManager; +import net.filebot.similarity.Match; +import net.filebot.similarity.MetricCascade; +import net.filebot.similarity.MetricMin; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.ui.rename.RenameModel.FormattedFuture; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.DefaultFancyListCellRenderer; +import net.filebot.util.ui.GradientStyle; +import net.filebot.web.Episode; class RenameListCellRenderer extends DefaultFancyListCellRenderer { diff --git a/source/net/filebot/ui/rename/RenameModel.java b/source/net/filebot/ui/rename/RenameModel.java index 8c37ba28..21dacb1a 100644 --- a/source/net/filebot/ui/rename/RenameModel.java +++ b/source/net/filebot/ui/rename/RenameModel.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -22,9 +22,9 @@ import java.util.concurrent.TimeoutException; import javax.swing.SwingWorker; import javax.swing.SwingWorker.StateValue; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.similarity.Match; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.TunedUtilities; import ca.odell.glazedlists.EventList; import ca.odell.glazedlists.TransformedList; import ca.odell.glazedlists.event.ListEvent; diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java index d5866764..7f02a577 100644 --- a/source/net/filebot/ui/rename/RenamePanel.java +++ b/source/net/filebot/ui/rename/RenamePanel.java @@ -1,13 +1,13 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.awt.event.KeyEvent.*; import static javax.swing.JOptionPane.*; import static javax.swing.KeyStroke.*; import static javax.swing.SwingUtilities.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.ExceptionUtilities.*; -import static net.sourceforge.filebot.util.ui.LoadingOverlayPane.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.ExceptionUtilities.*; +import static net.filebot.util.ui.LoadingOverlayPane.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Component; import java.awt.Cursor; @@ -47,30 +47,30 @@ import javax.swing.border.CompoundBorder; import javax.swing.border.TitledBorder; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.History; -import net.sourceforge.filebot.HistorySpooler; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.StandardRenameAction; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.format.MediaBindingBean; -import net.sourceforge.filebot.similarity.Match; -import net.sourceforge.filebot.ui.rename.FormatDialog.Mode; -import net.sourceforge.filebot.ui.rename.RenameModel.FormattedFuture; -import net.sourceforge.filebot.util.PreferencesMap.PreferencesEntry; -import net.sourceforge.filebot.util.ui.ActionPopup; -import net.sourceforge.filebot.util.ui.LoadingOverlayPane; -import net.sourceforge.filebot.web.AudioTrack; -import net.sourceforge.filebot.web.AudioTrackFormat; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.EpisodeFormat; -import net.sourceforge.filebot.web.EpisodeListProvider; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.MovieFormat; -import net.sourceforge.filebot.web.MovieIdentificationService; -import net.sourceforge.filebot.web.MusicIdentificationService; -import net.sourceforge.filebot.web.SortOrder; +import net.filebot.History; +import net.filebot.HistorySpooler; +import net.filebot.Language; +import net.filebot.ResourceManager; +import net.filebot.Settings; +import net.filebot.StandardRenameAction; +import net.filebot.WebServices; +import net.filebot.format.MediaBindingBean; +import net.filebot.similarity.Match; +import net.filebot.ui.rename.FormatDialog.Mode; +import net.filebot.ui.rename.RenameModel.FormattedFuture; +import net.filebot.util.PreferencesMap.PreferencesEntry; +import net.filebot.util.ui.ActionPopup; +import net.filebot.util.ui.LoadingOverlayPane; +import net.filebot.web.AudioTrack; +import net.filebot.web.AudioTrackFormat; +import net.filebot.web.Episode; +import net.filebot.web.EpisodeFormat; +import net.filebot.web.EpisodeListProvider; +import net.filebot.web.Movie; +import net.filebot.web.MovieFormat; +import net.filebot.web.MovieIdentificationService; +import net.filebot.web.MusicIdentificationService; +import net.filebot.web.SortOrder; import ca.odell.glazedlists.EventList; import ca.odell.glazedlists.ListSelection; import ca.odell.glazedlists.swing.EventSelectionModel; diff --git a/source/net/filebot/ui/rename/RenamePanelBuilder.java b/source/net/filebot/ui/rename/RenamePanelBuilder.java index 3320ed29..2050aaed 100644 --- a/source/net/filebot/ui/rename/RenamePanelBuilder.java +++ b/source/net/filebot/ui/rename/RenamePanelBuilder.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import javax.swing.Icon; import javax.swing.JComponent; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.PanelBuilder; +import net.filebot.ResourceManager; +import net.filebot.ui.PanelBuilder; public class RenamePanelBuilder implements PanelBuilder { diff --git a/source/net/filebot/ui/rename/ScrollPaneSynchronizer.java b/source/net/filebot/ui/rename/ScrollPaneSynchronizer.java index e84cb6ca..ec39c53f 100644 --- a/source/net/filebot/ui/rename/ScrollPaneSynchronizer.java +++ b/source/net/filebot/ui/rename/ScrollPaneSynchronizer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import java.awt.Dimension; diff --git a/source/net/filebot/ui/rename/ValidateDialog.java b/source/net/filebot/ui/rename/ValidateDialog.java index 5b610e3e..20bd43bf 100644 --- a/source/net/filebot/ui/rename/ValidateDialog.java +++ b/source/net/filebot/ui/rename/ValidateDialog.java @@ -1,11 +1,11 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static java.util.Collections.*; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; @@ -35,7 +35,7 @@ import javax.swing.KeyStroke; import javax.swing.text.BadLocationException; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; +import net.filebot.ResourceManager; class ValidateDialog extends JDialog { diff --git a/source/net/filebot/ui/sfv/ChecksumButton.java b/source/net/filebot/ui/sfv/ChecksumButton.java index 75db2cb0..07d8dd96 100644 --- a/source/net/filebot/ui/sfv/ChecksumButton.java +++ b/source/net/filebot/ui/sfv/ChecksumButton.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import static java.awt.Color.*; @@ -18,7 +18,7 @@ import javax.swing.Action; import javax.swing.Icon; import javax.swing.JToggleButton; -import net.sourceforge.filebot.ResourceManager; +import net.filebot.ResourceManager; public class ChecksumButton extends JToggleButton { diff --git a/source/net/filebot/ui/sfv/ChecksumCell.java b/source/net/filebot/ui/sfv/ChecksumCell.java index c2143f4d..76b6f2fc 100644 --- a/source/net/filebot/ui/sfv/ChecksumCell.java +++ b/source/net/filebot/ui/sfv/ChecksumCell.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.beans.PropertyChangeEvent; @@ -12,8 +12,8 @@ import java.util.concurrent.CancellationException; import javax.swing.SwingWorker.StateValue; import javax.swing.event.SwingPropertyChangeSupport; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.util.ExceptionUtilities; +import net.filebot.hash.HashType; +import net.filebot.util.ExceptionUtilities; class ChecksumCell { diff --git a/source/net/filebot/ui/sfv/ChecksumCellRenderer.java b/source/net/filebot/ui/sfv/ChecksumCellRenderer.java index a0b7a304..cfbd9a05 100644 --- a/source/net/filebot/ui/sfv/ChecksumCellRenderer.java +++ b/source/net/filebot/ui/sfv/ChecksumCellRenderer.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import static java.awt.Font.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; @@ -14,7 +14,7 @@ import javax.swing.SwingWorker; import javax.swing.SwingWorker.StateValue; import javax.swing.table.DefaultTableCellRenderer; -import net.sourceforge.filebot.util.ExceptionUtilities; +import net.filebot.util.ExceptionUtilities; public class ChecksumCellRenderer extends DefaultTableCellRenderer { diff --git a/source/net/filebot/ui/sfv/ChecksumComputationService.java b/source/net/filebot/ui/sfv/ChecksumComputationService.java index 42bb4289..0040092b 100644 --- a/source/net/filebot/ui/sfv/ChecksumComputationService.java +++ b/source/net/filebot/ui/sfv/ChecksumComputationService.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import static java.lang.Math.*; @@ -15,7 +15,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import net.sourceforge.filebot.util.DefaultThreadFactory; +import net.filebot.util.DefaultThreadFactory; class ChecksumComputationService { diff --git a/source/net/filebot/ui/sfv/ChecksumComputationTask.java b/source/net/filebot/ui/sfv/ChecksumComputationTask.java index 6a8791ca..0b986f24 100644 --- a/source/net/filebot/ui/sfv/ChecksumComputationTask.java +++ b/source/net/filebot/ui/sfv/ChecksumComputationTask.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.io.File; @@ -11,8 +11,8 @@ import java.util.concurrent.CancellationException; import javax.swing.SwingWorker; -import net.sourceforge.filebot.hash.Hash; -import net.sourceforge.filebot.hash.HashType; +import net.filebot.hash.Hash; +import net.filebot.hash.HashType; class ChecksumComputationTask extends SwingWorker, Void> { diff --git a/source/net/filebot/ui/sfv/ChecksumRow.java b/source/net/filebot/ui/sfv/ChecksumRow.java index dcf1750c..0f995002 100644 --- a/source/net/filebot/ui/sfv/ChecksumRow.java +++ b/source/net/filebot/ui/sfv/ChecksumRow.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; -import static net.sourceforge.filebot.hash.VerificationUtilities.*; +import static net.filebot.hash.VerificationUtilities.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -17,7 +17,7 @@ import java.util.Set; import javax.swing.event.SwingPropertyChangeSupport; -import net.sourceforge.filebot.hash.HashType; +import net.filebot.hash.HashType; class ChecksumRow { diff --git a/source/net/filebot/ui/sfv/ChecksumTable.java b/source/net/filebot/ui/sfv/ChecksumTable.java index 63b73a22..2926a133 100644 --- a/source/net/filebot/ui/sfv/ChecksumTable.java +++ b/source/net/filebot/ui/sfv/ChecksumTable.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; -import static net.sourceforge.filebot.hash.VerificationUtilities.*; +import static net.filebot.hash.VerificationUtilities.*; import java.awt.Color; import java.awt.event.MouseEvent; @@ -12,7 +12,7 @@ import javax.swing.ListSelectionModel; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumn; -import net.sourceforge.filebot.util.ui.TunedUtilities.DragDropRowTableUI; +import net.filebot.util.ui.TunedUtilities.DragDropRowTableUI; class ChecksumTable extends JTable { diff --git a/source/net/filebot/ui/sfv/ChecksumTableExportHandler.java b/source/net/filebot/ui/sfv/ChecksumTableExportHandler.java index b4f61f4c..01d93c5d 100644 --- a/source/net/filebot/ui/sfv/ChecksumTableExportHandler.java +++ b/source/net/filebot/ui/sfv/ChecksumTableExportHandler.java @@ -1,15 +1,15 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.io.File; import java.io.IOException; import java.io.PrintWriter; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.hash.VerificationFileWriter; -import net.sourceforge.filebot.ui.transfer.TextFileExportHandler; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.hash.HashType; +import net.filebot.hash.VerificationFileWriter; +import net.filebot.ui.transfer.TextFileExportHandler; +import net.filebot.util.FileUtilities; class ChecksumTableExportHandler extends TextFileExportHandler { diff --git a/source/net/filebot/ui/sfv/ChecksumTableModel.java b/source/net/filebot/ui/sfv/ChecksumTableModel.java index 2ac3029a..cca420f9 100644 --- a/source/net/filebot/ui/sfv/ChecksumTableModel.java +++ b/source/net/filebot/ui/sfv/ChecksumTableModel.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.beans.PropertyChangeEvent; @@ -18,9 +18,9 @@ import java.util.Set; import javax.swing.table.AbstractTableModel; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.util.FastFile; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.hash.HashType; +import net.filebot.util.FastFile; +import net.filebot.util.FileUtilities; class ChecksumTableModel extends AbstractTableModel { diff --git a/source/net/filebot/ui/sfv/ChecksumTableTransferablePolicy.java b/source/net/filebot/ui/sfv/ChecksumTableTransferablePolicy.java index e4e92563..ac042f44 100644 --- a/source/net/filebot/ui/sfv/ChecksumTableTransferablePolicy.java +++ b/source/net/filebot/ui/sfv/ChecksumTableTransferablePolicy.java @@ -1,11 +1,11 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import static java.util.Collections.*; -import static net.sourceforge.filebot.hash.VerificationUtilities.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.hash.VerificationUtilities.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.io.IOException; @@ -16,11 +16,11 @@ import java.util.Map.Entry; import java.util.concurrent.ExecutorService; import java.util.logging.Level; -import net.sourceforge.filebot.MediaTypes; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.hash.VerificationFileReader; -import net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy; -import net.sourceforge.filebot.util.ExceptionUtilities; +import net.filebot.MediaTypes; +import net.filebot.hash.HashType; +import net.filebot.hash.VerificationFileReader; +import net.filebot.ui.transfer.BackgroundFileTransferablePolicy; +import net.filebot.util.ExceptionUtilities; class ChecksumTableTransferablePolicy extends BackgroundFileTransferablePolicy { diff --git a/source/net/filebot/ui/sfv/HighlightPatternCellRenderer.java b/source/net/filebot/ui/sfv/HighlightPatternCellRenderer.java index 815ce683..bac15ac8 100644 --- a/source/net/filebot/ui/sfv/HighlightPatternCellRenderer.java +++ b/source/net/filebot/ui/sfv/HighlightPatternCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.awt.Component; @@ -10,7 +10,7 @@ import java.util.regex.Pattern; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import net.sourceforge.filebot.ui.sfv.ChecksumRow.State; +import net.filebot.ui.sfv.ChecksumRow.State; /** diff --git a/source/net/filebot/ui/sfv/SfvPanel.java b/source/net/filebot/ui/sfv/SfvPanel.java index 525284bc..bc27f6a1 100644 --- a/source/net/filebot/ui/sfv/SfvPanel.java +++ b/source/net/filebot/ui/sfv/SfvPanel.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import static java.lang.Math.*; -import static net.sourceforge.filebot.ui.sfv.ChecksumTableModel.*; -import static net.sourceforge.filebot.ui.transfer.BackgroundFileTransferablePolicy.*; +import static net.filebot.ui.sfv.ChecksumTableModel.*; +import static net.filebot.ui.transfer.BackgroundFileTransferablePolicy.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -30,14 +30,14 @@ import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.hash.HashType; -import net.sourceforge.filebot.ui.SelectDialog; -import net.sourceforge.filebot.ui.transfer.DefaultTransferHandler; -import net.sourceforge.filebot.ui.transfer.LoadAction; -import net.sourceforge.filebot.ui.transfer.SaveAction; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.ResourceManager; +import net.filebot.hash.HashType; +import net.filebot.ui.SelectDialog; +import net.filebot.ui.transfer.DefaultTransferHandler; +import net.filebot.ui.transfer.LoadAction; +import net.filebot.ui.transfer.SaveAction; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.TunedUtilities; public class SfvPanel extends JComponent { diff --git a/source/net/filebot/ui/sfv/SfvPanelBuilder.java b/source/net/filebot/ui/sfv/SfvPanelBuilder.java index f0d2e760..e22abda5 100644 --- a/source/net/filebot/ui/sfv/SfvPanelBuilder.java +++ b/source/net/filebot/ui/sfv/SfvPanelBuilder.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import javax.swing.Icon; import javax.swing.JComponent; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.PanelBuilder; +import net.filebot.ResourceManager; +import net.filebot.ui.PanelBuilder; public class SfvPanelBuilder implements PanelBuilder { diff --git a/source/net/filebot/ui/sfv/StateIconCellRenderer.java b/source/net/filebot/ui/sfv/StateIconCellRenderer.java index 7b628e53..1bec997e 100644 --- a/source/net/filebot/ui/sfv/StateIconCellRenderer.java +++ b/source/net/filebot/ui/sfv/StateIconCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.awt.Component; @@ -11,8 +11,8 @@ import javax.swing.JTable; import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.sfv.ChecksumRow.State; +import net.filebot.ResourceManager; +import net.filebot.ui.sfv.ChecksumRow.State; class StateIconCellRenderer extends DefaultTableCellRenderer { diff --git a/source/net/filebot/ui/sfv/SwingWorkerCellRenderer.java b/source/net/filebot/ui/sfv/SwingWorkerCellRenderer.java index 8e31ce50..8e5ed212 100644 --- a/source/net/filebot/ui/sfv/SwingWorkerCellRenderer.java +++ b/source/net/filebot/ui/sfv/SwingWorkerCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.awt.BorderLayout; diff --git a/source/net/filebot/ui/sfv/TotalProgressPanel.java b/source/net/filebot/ui/sfv/TotalProgressPanel.java index bb18e9d3..a71b038b 100644 --- a/source/net/filebot/ui/sfv/TotalProgressPanel.java +++ b/source/net/filebot/ui/sfv/TotalProgressPanel.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.sfv; +package net.filebot.ui.sfv; import java.awt.event.ActionEvent; diff --git a/source/net/filebot/ui/subtitle/MemoryFileListExportHandler.java b/source/net/filebot/ui/subtitle/MemoryFileListExportHandler.java index cfce329f..14ff26f0 100644 --- a/source/net/filebot/ui/subtitle/MemoryFileListExportHandler.java +++ b/source/net/filebot/ui/subtitle/MemoryFileListExportHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import java.awt.datatransfer.Clipboard; @@ -14,10 +14,10 @@ import javax.swing.JComponent; import javax.swing.JList; import javax.swing.TransferHandler; -import net.sourceforge.filebot.ui.transfer.ByteBufferTransferable; -import net.sourceforge.filebot.ui.transfer.ClipboardHandler; -import net.sourceforge.filebot.ui.transfer.TransferableExportHandler; -import net.sourceforge.filebot.vfs.MemoryFile; +import net.filebot.ui.transfer.ByteBufferTransferable; +import net.filebot.ui.transfer.ClipboardHandler; +import net.filebot.ui.transfer.TransferableExportHandler; +import net.filebot.vfs.MemoryFile; class MemoryFileListExportHandler implements TransferableExportHandler, ClipboardHandler { diff --git a/source/net/filebot/ui/subtitle/SimpleComboBox.java b/source/net/filebot/ui/subtitle/SimpleComboBox.java index 5e86b7e5..2cbeb0ad 100644 --- a/source/net/filebot/ui/subtitle/SimpleComboBox.java +++ b/source/net/filebot/ui/subtitle/SimpleComboBox.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import static javax.swing.BorderFactory.*; @@ -13,7 +13,7 @@ import javax.swing.plaf.basic.BasicComboBoxUI; import javax.swing.plaf.basic.BasicComboPopup; import javax.swing.plaf.basic.ComboPopup; -import net.sourceforge.filebot.ResourceManager; +import net.filebot.ResourceManager; public class SimpleComboBox extends JComboBox { diff --git a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java index 51bb4366..72aa6922 100644 --- a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java +++ b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import static javax.swing.BorderFactory.*; import static javax.swing.JOptionPane.*; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.subtitle.SubtitleUtilities.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; @@ -57,21 +57,21 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.similarity.EpisodeMetrics; -import net.sourceforge.filebot.similarity.MetricCascade; -import net.sourceforge.filebot.similarity.SimilarityMetric; -import net.sourceforge.filebot.subtitle.SubtitleNaming; -import net.sourceforge.filebot.util.ui.AbstractBean; -import net.sourceforge.filebot.util.ui.DashedSeparator; -import net.sourceforge.filebot.util.ui.EmptySelectionModel; -import net.sourceforge.filebot.util.ui.LinkButton; -import net.sourceforge.filebot.util.ui.RoundBorder; -import net.sourceforge.filebot.vfs.MemoryFile; -import net.sourceforge.filebot.web.SubtitleDescriptor; -import net.sourceforge.filebot.web.SubtitleProvider; -import net.sourceforge.filebot.web.VideoHashSubtitleService; +import net.filebot.Analytics; +import net.filebot.ResourceManager; +import net.filebot.similarity.EpisodeMetrics; +import net.filebot.similarity.MetricCascade; +import net.filebot.similarity.SimilarityMetric; +import net.filebot.subtitle.SubtitleNaming; +import net.filebot.util.ui.AbstractBean; +import net.filebot.util.ui.DashedSeparator; +import net.filebot.util.ui.EmptySelectionModel; +import net.filebot.util.ui.LinkButton; +import net.filebot.util.ui.RoundBorder; +import net.filebot.vfs.MemoryFile; +import net.filebot.web.SubtitleDescriptor; +import net.filebot.web.SubtitleProvider; +import net.filebot.web.VideoHashSubtitleService; class SubtitleAutoMatchDialog extends JDialog { diff --git a/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java b/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java index 6d728cec..dfa44f24 100644 --- a/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java +++ b/source/net/filebot/ui/subtitle/SubtitleDownloadComponent.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.subtitle.SubtitleUtilities.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.subtitle.SubtitleUtilities.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -40,15 +40,15 @@ import javax.swing.SwingUtilities; import javax.swing.border.LineBorder; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.subtitle.SubtitleFormat; -import net.sourceforge.filebot.ui.subtitle.SubtitlePackage.Download.Phase; -import net.sourceforge.filebot.ui.transfer.DefaultTransferHandler; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.ui.ListView; -import net.sourceforge.filebot.util.ui.TunedUtilities; -import net.sourceforge.filebot.vfs.MemoryFile; +import net.filebot.Analytics; +import net.filebot.ResourceManager; +import net.filebot.subtitle.SubtitleFormat; +import net.filebot.ui.subtitle.SubtitlePackage.Download.Phase; +import net.filebot.ui.transfer.DefaultTransferHandler; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.ui.ListView; +import net.filebot.util.ui.TunedUtilities; +import net.filebot.vfs.MemoryFile; import ca.odell.glazedlists.BasicEventList; import ca.odell.glazedlists.EventList; import ca.odell.glazedlists.FilterList; diff --git a/source/net/filebot/ui/subtitle/SubtitleDropTarget.java b/source/net/filebot/ui/subtitle/SubtitleDropTarget.java index 71f0b44e..48357257 100644 --- a/source/net/filebot/ui/subtitle/SubtitleDropTarget.java +++ b/source/net/filebot/ui/subtitle/SubtitleDropTarget.java @@ -1,11 +1,11 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.media.MediaDetection.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.ui.transfer.FileTransferable.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.media.MediaDetection.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.ui.transfer.FileTransferable.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Cursor; @@ -34,12 +34,12 @@ import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.filechooser.FileNameExtensionFilter; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.FileUtilities.ParentFilter; -import net.sourceforge.filebot.web.OpenSubtitlesClient; -import net.sourceforge.filebot.web.SubtitleProvider; -import net.sourceforge.filebot.web.VideoHashSubtitleService; +import net.filebot.ResourceManager; +import net.filebot.util.FileUtilities; +import net.filebot.util.FileUtilities.ParentFilter; +import net.filebot.web.OpenSubtitlesClient; +import net.filebot.web.SubtitleProvider; +import net.filebot.web.VideoHashSubtitleService; abstract class SubtitleDropTarget extends JButton { diff --git a/source/net/filebot/ui/subtitle/SubtitleFileChooser.java b/source/net/filebot/ui/subtitle/SubtitleFileChooser.java index ca3f4c75..c283311d 100644 --- a/source/net/filebot/ui/subtitle/SubtitleFileChooser.java +++ b/source/net/filebot/ui/subtitle/SubtitleFileChooser.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import static java.util.Collections.*; @@ -18,7 +18,7 @@ import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.subtitle.SubtitleFormat; +import net.filebot.subtitle.SubtitleFormat; public class SubtitleFileChooser extends JFileChooser { diff --git a/source/net/filebot/ui/subtitle/SubtitlePackage.java b/source/net/filebot/ui/subtitle/SubtitlePackage.java index 40c1acec..59ce4b31 100644 --- a/source/net/filebot/ui/subtitle/SubtitlePackage.java +++ b/source/net/filebot/ui/subtitle/SubtitlePackage.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import static java.util.Collections.*; -import static net.sourceforge.filebot.MediaTypes.*; +import static net.filebot.MediaTypes.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -18,12 +18,12 @@ import java.util.ResourceBundle; import javax.swing.SwingWorker; import javax.swing.event.SwingPropertyChangeSupport; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.vfs.ArchiveType; -import net.sourceforge.filebot.vfs.MemoryFile; -import net.sourceforge.filebot.web.SubtitleDescriptor; -import net.sourceforge.filebot.web.SubtitleProvider; +import net.filebot.Language; +import net.filebot.util.FileUtilities; +import net.filebot.vfs.ArchiveType; +import net.filebot.vfs.MemoryFile; +import net.filebot.web.SubtitleDescriptor; +import net.filebot.web.SubtitleProvider; public class SubtitlePackage { diff --git a/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java b/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java index 0f98adf2..81188bc1 100644 --- a/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java +++ b/source/net/filebot/ui/subtitle/SubtitlePackageCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import java.awt.Color; @@ -11,9 +11,9 @@ import javax.swing.JList; import javax.swing.border.CompoundBorder; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.ui.AbstractFancyListCellRenderer; -import net.sourceforge.filebot.util.ui.DashedSeparator; +import net.filebot.ResourceManager; +import net.filebot.util.ui.AbstractFancyListCellRenderer; +import net.filebot.util.ui.DashedSeparator; class SubtitlePackageCellRenderer extends AbstractFancyListCellRenderer { diff --git a/source/net/filebot/ui/subtitle/SubtitlePanel.java b/source/net/filebot/ui/subtitle/SubtitlePanel.java index 4890cd49..b7235c94 100644 --- a/source/net/filebot/ui/subtitle/SubtitlePanel.java +++ b/source/net/filebot/ui/subtitle/SubtitlePanel.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.ui.LanguageComboBoxModel.*; -import static net.sourceforge.filebot.ui.NotificationLogging.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.ui.LanguageComboBoxModel.*; +import static net.filebot.ui.NotificationLogging.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Cursor; @@ -33,20 +33,20 @@ import javax.swing.JTextField; import javax.swing.border.TitledBorder; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.ui.AbstractSearchPanel; -import net.sourceforge.filebot.ui.LanguageComboBox; -import net.sourceforge.filebot.ui.SelectDialog; -import net.sourceforge.filebot.util.ui.LabelProvider; -import net.sourceforge.filebot.util.ui.SimpleLabelProvider; -import net.sourceforge.filebot.web.OpenSubtitlesClient; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.SubtitleDescriptor; -import net.sourceforge.filebot.web.SubtitleProvider; -import net.sourceforge.filebot.web.VideoHashSubtitleService; +import net.filebot.Language; +import net.filebot.ResourceManager; +import net.filebot.Settings; +import net.filebot.WebServices; +import net.filebot.ui.AbstractSearchPanel; +import net.filebot.ui.LanguageComboBox; +import net.filebot.ui.SelectDialog; +import net.filebot.util.ui.LabelProvider; +import net.filebot.util.ui.SimpleLabelProvider; +import net.filebot.web.OpenSubtitlesClient; +import net.filebot.web.SearchResult; +import net.filebot.web.SubtitleDescriptor; +import net.filebot.web.SubtitleProvider; +import net.filebot.web.VideoHashSubtitleService; public class SubtitlePanel extends AbstractSearchPanel { diff --git a/source/net/filebot/ui/subtitle/SubtitlePanelBuilder.java b/source/net/filebot/ui/subtitle/SubtitlePanelBuilder.java index a361b8be..49bf07a3 100644 --- a/source/net/filebot/ui/subtitle/SubtitlePanelBuilder.java +++ b/source/net/filebot/ui/subtitle/SubtitlePanelBuilder.java @@ -1,12 +1,12 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import javax.swing.Icon; import javax.swing.JComponent; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.ui.PanelBuilder; +import net.filebot.ResourceManager; +import net.filebot.ui.PanelBuilder; public class SubtitlePanelBuilder implements PanelBuilder { diff --git a/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java b/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java index 0d879426..4b5cc782 100644 --- a/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java +++ b/source/net/filebot/ui/subtitle/SubtitleUploadDialog.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; -import static net.sourceforge.filebot.MediaTypes.*; -import static net.sourceforge.filebot.media.MediaDetection.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.MediaTypes.*; +import static net.filebot.media.MediaDetection.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; @@ -50,22 +50,22 @@ import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.Analytics; -import net.sourceforge.filebot.Language; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.WebServices; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.ui.LanguageComboBox; -import net.sourceforge.filebot.ui.SelectDialog; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.util.ui.AbstractBean; -import net.sourceforge.filebot.util.ui.EmptySelectionModel; -import net.sourceforge.filebot.web.Movie; -import net.sourceforge.filebot.web.OpenSubtitlesClient; -import net.sourceforge.filebot.web.SearchResult; -import net.sourceforge.filebot.web.TheTVDBClient.SeriesInfo; -import net.sourceforge.filebot.web.TheTVDBSearchResult; -import net.sourceforge.filebot.web.VideoHashSubtitleService.CheckResult; +import net.filebot.Analytics; +import net.filebot.Language; +import net.filebot.ResourceManager; +import net.filebot.WebServices; +import net.filebot.media.MediaDetection; +import net.filebot.ui.LanguageComboBox; +import net.filebot.ui.SelectDialog; +import net.filebot.util.FileUtilities; +import net.filebot.util.ui.AbstractBean; +import net.filebot.util.ui.EmptySelectionModel; +import net.filebot.web.Movie; +import net.filebot.web.OpenSubtitlesClient; +import net.filebot.web.SearchResult; +import net.filebot.web.TheTVDBClient.SeriesInfo; +import net.filebot.web.TheTVDBSearchResult; +import net.filebot.web.VideoHashSubtitleService.CheckResult; public class SubtitleUploadDialog extends JDialog { diff --git a/source/net/filebot/ui/subtitle/SubtitleViewer.java b/source/net/filebot/ui/subtitle/SubtitleViewer.java index 7d88b0c8..072c12b1 100644 --- a/source/net/filebot/ui/subtitle/SubtitleViewer.java +++ b/source/net/filebot/ui/subtitle/SubtitleViewer.java @@ -1,11 +1,11 @@ -package net.sourceforge.filebot.ui.subtitle; +package net.filebot.ui.subtitle; import static java.awt.Font.*; import static java.util.Collections.*; import static java.util.regex.Pattern.*; -import static net.sourceforge.filebot.util.ui.TunedUtilities.*; +import static net.filebot.util.ui.TunedUtilities.*; import java.awt.Color; import java.awt.Component; @@ -45,12 +45,12 @@ import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import net.miginfocom.swing.MigLayout; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.subtitle.SubtitleElement; -import net.sourceforge.filebot.util.ui.GradientStyle; -import net.sourceforge.filebot.util.ui.LazyDocumentListener; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder; -import net.sourceforge.filebot.util.ui.notification.SeparatorBorder.Position; +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; public class SubtitleViewer extends JFrame { diff --git a/source/net/filebot/ui/transfer/ArrayTransferable.java b/source/net/filebot/ui/transfer/ArrayTransferable.java index 91c98c2a..5c52e0c9 100644 --- a/source/net/filebot/ui/transfer/ArrayTransferable.java +++ b/source/net/filebot/ui/transfer/ArrayTransferable.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.DataFlavor; diff --git a/source/net/filebot/ui/transfer/BackgroundFileTransferablePolicy.java b/source/net/filebot/ui/transfer/BackgroundFileTransferablePolicy.java index 4e469fe3..4038b605 100644 --- a/source/net/filebot/ui/transfer/BackgroundFileTransferablePolicy.java +++ b/source/net/filebot/ui/transfer/BackgroundFileTransferablePolicy.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; -import static net.sourceforge.filebot.ui.transfer.FileTransferable.*; +import static net.filebot.ui.transfer.FileTransferable.*; import java.awt.datatransfer.Transferable; import java.beans.PropertyChangeListener; diff --git a/source/net/filebot/ui/transfer/ByteBufferTransferable.java b/source/net/filebot/ui/transfer/ByteBufferTransferable.java index 49049524..7b643299 100644 --- a/source/net/filebot/ui/transfer/ByteBufferTransferable.java +++ b/source/net/filebot/ui/transfer/ByteBufferTransferable.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; -import static net.sourceforge.filebot.Settings.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.Settings.*; +import static net.filebot.util.FileUtilities.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.sourceforge.filebot.util.TemporaryFolder; +import net.filebot.util.TemporaryFolder; public class ByteBufferTransferable implements Transferable { diff --git a/source/net/filebot/ui/transfer/ClipboardHandler.java b/source/net/filebot/ui/transfer/ClipboardHandler.java index 293c4670..e3ef168c 100644 --- a/source/net/filebot/ui/transfer/ClipboardHandler.java +++ b/source/net/filebot/ui/transfer/ClipboardHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.Clipboard; diff --git a/source/net/filebot/ui/transfer/CompositeTranserable.java b/source/net/filebot/ui/transfer/CompositeTranserable.java index 36415a3b..3fbf1349 100644 --- a/source/net/filebot/ui/transfer/CompositeTranserable.java +++ b/source/net/filebot/ui/transfer/CompositeTranserable.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.DataFlavor; diff --git a/source/net/filebot/ui/transfer/DefaultClipboardHandler.java b/source/net/filebot/ui/transfer/DefaultClipboardHandler.java index c7cad09b..b110fdbb 100644 --- a/source/net/filebot/ui/transfer/DefaultClipboardHandler.java +++ b/source/net/filebot/ui/transfer/DefaultClipboardHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.Clipboard; diff --git a/source/net/filebot/ui/transfer/DefaultTransferHandler.java b/source/net/filebot/ui/transfer/DefaultTransferHandler.java index 6d1fa64d..c5028be3 100644 --- a/source/net/filebot/ui/transfer/DefaultTransferHandler.java +++ b/source/net/filebot/ui/transfer/DefaultTransferHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.Clipboard; diff --git a/source/net/filebot/ui/transfer/FileExportHandler.java b/source/net/filebot/ui/transfer/FileExportHandler.java index 94654b2a..9cd172ac 100644 --- a/source/net/filebot/ui/transfer/FileExportHandler.java +++ b/source/net/filebot/ui/transfer/FileExportHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.io.File; diff --git a/source/net/filebot/ui/transfer/FileTransferable.java b/source/net/filebot/ui/transfer/FileTransferable.java index 25da4eab..92952cde 100644 --- a/source/net/filebot/ui/transfer/FileTransferable.java +++ b/source/net/filebot/ui/transfer/FileTransferable.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; -import static net.sourceforge.filebot.Settings.*; +import static net.filebot.Settings.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; @@ -20,7 +20,7 @@ import java.util.Scanner; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.gio.GVFS; +import net.filebot.gio.GVFS; public class FileTransferable implements Transferable { diff --git a/source/net/filebot/ui/transfer/FileTransferablePolicy.java b/source/net/filebot/ui/transfer/FileTransferablePolicy.java index 25584377..2a3376c5 100644 --- a/source/net/filebot/ui/transfer/FileTransferablePolicy.java +++ b/source/net/filebot/ui/transfer/FileTransferablePolicy.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; -import static net.sourceforge.filebot.ui.transfer.FileTransferable.*; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.ui.transfer.FileTransferable.*; +import static net.filebot.util.FileUtilities.*; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; diff --git a/source/net/filebot/ui/transfer/LoadAction.java b/source/net/filebot/ui/transfer/LoadAction.java index 4701adf5..bd21885f 100644 --- a/source/net/filebot/ui/transfer/LoadAction.java +++ b/source/net/filebot/ui/transfer/LoadAction.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; -import static net.sourceforge.filebot.ui.NotificationLogging.*; +import static net.filebot.ui.NotificationLogging.*; import java.awt.event.ActionEvent; import java.io.File; @@ -10,9 +10,9 @@ import javax.swing.AbstractAction; import javax.swing.Icon; import javax.swing.JFileChooser; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; -import net.sourceforge.filebot.ui.transfer.TransferablePolicy.TransferAction; +import net.filebot.ResourceManager; +import net.filebot.Settings; +import net.filebot.ui.transfer.TransferablePolicy.TransferAction; public class LoadAction extends AbstractAction { diff --git a/source/net/filebot/ui/transfer/SaveAction.java b/source/net/filebot/ui/transfer/SaveAction.java index 3b1aa22c..46707770 100644 --- a/source/net/filebot/ui/transfer/SaveAction.java +++ b/source/net/filebot/ui/transfer/SaveAction.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.awt.event.ActionEvent; import java.io.File; @@ -15,8 +15,8 @@ import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.JFileChooser; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.Settings; +import net.filebot.ResourceManager; +import net.filebot.Settings; public class SaveAction extends AbstractAction { diff --git a/source/net/filebot/ui/transfer/TextFileExportHandler.java b/source/net/filebot/ui/transfer/TextFileExportHandler.java index 3f720871..75da2474 100644 --- a/source/net/filebot/ui/transfer/TextFileExportHandler.java +++ b/source/net/filebot/ui/transfer/TextFileExportHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.Transferable; diff --git a/source/net/filebot/ui/transfer/TextFileTransferable.java b/source/net/filebot/ui/transfer/TextFileTransferable.java index 61a701c0..f5a7c933 100644 --- a/source/net/filebot/ui/transfer/TextFileTransferable.java +++ b/source/net/filebot/ui/transfer/TextFileTransferable.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.DataFlavor; diff --git a/source/net/filebot/ui/transfer/TransferableExportHandler.java b/source/net/filebot/ui/transfer/TransferableExportHandler.java index f4721bff..00145894 100644 --- a/source/net/filebot/ui/transfer/TransferableExportHandler.java +++ b/source/net/filebot/ui/transfer/TransferableExportHandler.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.Transferable; diff --git a/source/net/filebot/ui/transfer/TransferablePolicy.java b/source/net/filebot/ui/transfer/TransferablePolicy.java index 46212e63..f2150a25 100644 --- a/source/net/filebot/ui/transfer/TransferablePolicy.java +++ b/source/net/filebot/ui/transfer/TransferablePolicy.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.awt.datatransfer.Transferable; diff --git a/source/net/filebot/ui/transfer/TransferablePolicyFileFilter.java b/source/net/filebot/ui/transfer/TransferablePolicyFileFilter.java index 7ae16621..c63e5374 100644 --- a/source/net/filebot/ui/transfer/TransferablePolicyFileFilter.java +++ b/source/net/filebot/ui/transfer/TransferablePolicyFileFilter.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.transfer; +package net.filebot.ui.transfer; import java.io.File; diff --git a/source/net/filebot/util/ByteBufferInputStream.java b/source/net/filebot/util/ByteBufferInputStream.java index 1a5a932b..40be5d75 100644 --- a/source/net/filebot/util/ByteBufferInputStream.java +++ b/source/net/filebot/util/ByteBufferInputStream.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.io.IOException; diff --git a/source/net/filebot/util/ByteBufferOutputStream.java b/source/net/filebot/util/ByteBufferOutputStream.java index 5c6e905f..18d1d4e7 100644 --- a/source/net/filebot/util/ByteBufferOutputStream.java +++ b/source/net/filebot/util/ByteBufferOutputStream.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.io.IOException; import java.io.InputStream; diff --git a/source/net/filebot/util/DefaultThreadFactory.java b/source/net/filebot/util/DefaultThreadFactory.java index a37af384..816e0578 100644 --- a/source/net/filebot/util/DefaultThreadFactory.java +++ b/source/net/filebot/util/DefaultThreadFactory.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.concurrent.ThreadFactory; diff --git a/source/net/filebot/util/DownloadTask.java b/source/net/filebot/util/DownloadTask.java index f71ce11b..527489bb 100644 --- a/source/net/filebot/util/DownloadTask.java +++ b/source/net/filebot/util/DownloadTask.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.web.WebRequest.*; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/source/net/filebot/util/ExceptionUtilities.java b/source/net/filebot/util/ExceptionUtilities.java index c903a4c9..f35b1a73 100644 --- a/source/net/filebot/util/ExceptionUtilities.java +++ b/source/net/filebot/util/ExceptionUtilities.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; public final class ExceptionUtilities { diff --git a/source/net/filebot/util/FastFile.java b/source/net/filebot/util/FastFile.java index 76f4ba9c..6ca8d484 100644 --- a/source/net/filebot/util/FastFile.java +++ b/source/net/filebot/util/FastFile.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.io.File; import java.util.ArrayList; diff --git a/source/net/filebot/util/FileUtilities.java b/source/net/filebot/util/FileUtilities.java index 7a2d3281..4eaf79b9 100644 --- a/source/net/filebot/util/FileUtilities.java +++ b/source/net/filebot/util/FileUtilities.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static java.util.Arrays.*; diff --git a/source/net/filebot/util/FilterIterator.java b/source/net/filebot/util/FilterIterator.java index 4571c81e..43437991 100644 --- a/source/net/filebot/util/FilterIterator.java +++ b/source/net/filebot/util/FilterIterator.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.Iterator; diff --git a/source/net/filebot/util/ListChangeSynchronizer.java b/source/net/filebot/util/ListChangeSynchronizer.java index 9e7dfba7..0e31cbad 100644 --- a/source/net/filebot/util/ListChangeSynchronizer.java +++ b/source/net/filebot/util/ListChangeSynchronizer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.List; diff --git a/source/net/filebot/util/PreferencesList.java b/source/net/filebot/util/PreferencesList.java index fff55d83..fcb328a5 100644 --- a/source/net/filebot/util/PreferencesList.java +++ b/source/net/filebot/util/PreferencesList.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.AbstractList; @@ -9,7 +9,7 @@ import java.util.List; import java.util.RandomAccess; import java.util.prefs.Preferences; -import net.sourceforge.filebot.util.PreferencesMap.Adapter; +import net.filebot.util.PreferencesMap.Adapter; public class PreferencesList extends AbstractList implements RandomAccess { diff --git a/source/net/filebot/util/PreferencesMap.java b/source/net/filebot/util/PreferencesMap.java index 0f9383af..6c053436 100644 --- a/source/net/filebot/util/PreferencesMap.java +++ b/source/net/filebot/util/PreferencesMap.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.io.ByteArrayInputStream; diff --git a/source/net/filebot/util/StringUtilities.java b/source/net/filebot/util/StringUtilities.java index 46a833c8..94ab6f10 100644 --- a/source/net/filebot/util/StringUtilities.java +++ b/source/net/filebot/util/StringUtilities.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static java.util.Arrays.*; diff --git a/source/net/filebot/util/TeePrintStream.java b/source/net/filebot/util/TeePrintStream.java index 3bf5b878..acd9b78c 100644 --- a/source/net/filebot/util/TeePrintStream.java +++ b/source/net/filebot/util/TeePrintStream.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.io.IOException; diff --git a/source/net/filebot/util/TemporaryFolder.java b/source/net/filebot/util/TemporaryFolder.java index f1c7189a..0bdd636a 100644 --- a/source/net/filebot/util/TemporaryFolder.java +++ b/source/net/filebot/util/TemporaryFolder.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.io.File; diff --git a/source/net/filebot/util/Timer.java b/source/net/filebot/util/Timer.java index 01f0d6be..eb3490cf 100644 --- a/source/net/filebot/util/Timer.java +++ b/source/net/filebot/util/Timer.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/source/net/filebot/util/TreeIterator.java b/source/net/filebot/util/TreeIterator.java index a9b1e34b..10fe5164 100644 --- a/source/net/filebot/util/TreeIterator.java +++ b/source/net/filebot/util/TreeIterator.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.Arrays; diff --git a/source/net/filebot/util/XPathUtilities.java b/source/net/filebot/util/XPathUtilities.java index 77335586..d53f0814 100644 --- a/source/net/filebot/util/XPathUtilities.java +++ b/source/net/filebot/util/XPathUtilities.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.AbstractList; diff --git a/source/net/filebot/util/prefs/FilePreferences.java b/source/net/filebot/util/prefs/FilePreferences.java index cd9db917..b9a3699d 100644 --- a/source/net/filebot/util/prefs/FilePreferences.java +++ b/source/net/filebot/util/prefs/FilePreferences.java @@ -1,6 +1,6 @@ // https://github.com/sonatype/nexus/blob/2f0e154ec565969b4fd8698883ab76a461210f4f/nexus/nexus-test-harness/nexus-it-helper-plugin/src/main/java/org/sonatype/nexus/rt/prefs/FilePreferences.java -package net.sourceforge.filebot.util.prefs; +package net.filebot.util.prefs; import java.io.File; diff --git a/source/net/filebot/util/prefs/FilePreferencesFactory.java b/source/net/filebot/util/prefs/FilePreferencesFactory.java index 5ceb65a7..9beb65aa 100644 --- a/source/net/filebot/util/prefs/FilePreferencesFactory.java +++ b/source/net/filebot/util/prefs/FilePreferencesFactory.java @@ -1,6 +1,6 @@ // https://github.com/sonatype/nexus/blob/2f0e154ec565969b4fd8698883ab76a461210f4f/nexus/nexus-test-harness/nexus-it-helper-plugin/src/main/java/org/sonatype/nexus/rt/prefs/FilePreferencesFactory.java -package net.sourceforge.filebot.util.prefs; +package net.filebot.util.prefs; import java.io.File; @@ -10,10 +10,10 @@ import java.util.prefs.PreferencesFactory; /** * PreferencesFactory implementation that stores the preferences in a user-defined file. To use it, set the system - * property java.util.prefs.PreferencesFactory to net.sourceforge.filebot.util.pref.FilePreferencesFactory + * property java.util.prefs.PreferencesFactory to net.filebot.util.pref.FilePreferencesFactory *

* The file defaults to [user.home]/.fileprefs, but may be overridden with the system property - * net.sourceforge.filebot.util.pref.FilePreferencesFactory.file. Modified by cstamas, switched to SLF4J logging, and + * net.filebot.util.pref.FilePreferencesFactory.file. Modified by cstamas, switched to SLF4J logging, and * exposed preferences file property. * * @author David Croft (www.davidc.net) @@ -23,7 +23,7 @@ public class FilePreferencesFactory implements PreferencesFactory { Preferences rootPreferences; - public static final String SYSTEM_PROPERTY_FILE = "net.sourceforge.filebot.util.prefs.file"; + public static final String SYSTEM_PROPERTY_FILE = "net.filebot.util.prefs.file"; public Preferences systemRoot() { diff --git a/source/net/filebot/util/ui/AbstractBean.java b/source/net/filebot/util/ui/AbstractBean.java index 98a04571..3e745cdb 100644 --- a/source/net/filebot/util/ui/AbstractBean.java +++ b/source/net/filebot/util/ui/AbstractBean.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.beans.PropertyChangeEvent; diff --git a/source/net/filebot/util/ui/AbstractFancyListCellRenderer.java b/source/net/filebot/util/ui/AbstractFancyListCellRenderer.java index 8f82ce32..d86b36f6 100644 --- a/source/net/filebot/util/ui/AbstractFancyListCellRenderer.java +++ b/source/net/filebot/util/ui/AbstractFancyListCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/ActionPopup.java b/source/net/filebot/util/ui/ActionPopup.java index 2e73df40..ef7126e1 100644 --- a/source/net/filebot/util/ui/ActionPopup.java +++ b/source/net/filebot/util/ui/ActionPopup.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; import java.awt.event.ActionEvent; diff --git a/source/net/filebot/util/ui/ColorTintImageFilter.java b/source/net/filebot/util/ui/ColorTintImageFilter.java index 55fc2e9a..dcfcb649 100644 --- a/source/net/filebot/util/ui/ColorTintImageFilter.java +++ b/source/net/filebot/util/ui/ColorTintImageFilter.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/DashedSeparator.java b/source/net/filebot/util/ui/DashedSeparator.java index 026aa566..9383d75f 100644 --- a/source/net/filebot/util/ui/DashedSeparator.java +++ b/source/net/filebot/util/ui/DashedSeparator.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import static java.awt.BasicStroke.*; diff --git a/source/net/filebot/util/ui/DefaultFancyListCellRenderer.java b/source/net/filebot/util/ui/DefaultFancyListCellRenderer.java index 74a82f48..e307d2e2 100644 --- a/source/net/filebot/util/ui/DefaultFancyListCellRenderer.java +++ b/source/net/filebot/util/ui/DefaultFancyListCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/EmptySelectionModel.java b/source/net/filebot/util/ui/EmptySelectionModel.java index 64481656..e8947e96 100644 --- a/source/net/filebot/util/ui/EmptySelectionModel.java +++ b/source/net/filebot/util/ui/EmptySelectionModel.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import javax.swing.ListSelectionModel; diff --git a/source/net/filebot/util/ui/FancyTreeCellRenderer.java b/source/net/filebot/util/ui/FancyTreeCellRenderer.java index 91f0033f..ba72160b 100644 --- a/source/net/filebot/util/ui/FancyTreeCellRenderer.java +++ b/source/net/filebot/util/ui/FancyTreeCellRenderer.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/GradientStyle.java b/source/net/filebot/util/ui/GradientStyle.java index f11d9f86..bd99c0a6 100644 --- a/source/net/filebot/util/ui/GradientStyle.java +++ b/source/net/filebot/util/ui/GradientStyle.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/LabelProvider.java b/source/net/filebot/util/ui/LabelProvider.java index 03e40639..73bdd42e 100644 --- a/source/net/filebot/util/ui/LabelProvider.java +++ b/source/net/filebot/util/ui/LabelProvider.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import javax.swing.Icon; diff --git a/source/net/filebot/util/ui/LazyDocumentListener.java b/source/net/filebot/util/ui/LazyDocumentListener.java index e877e207..26f71f4c 100644 --- a/source/net/filebot/util/ui/LazyDocumentListener.java +++ b/source/net/filebot/util/ui/LazyDocumentListener.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.event.ActionEvent; diff --git a/source/net/filebot/util/ui/LinkButton.java b/source/net/filebot/util/ui/LinkButton.java index a860243c..be20d177 100644 --- a/source/net/filebot/util/ui/LinkButton.java +++ b/source/net/filebot/util/ui/LinkButton.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/ListView.java b/source/net/filebot/util/ui/ListView.java index bb349ebc..1b495075 100644 --- a/source/net/filebot/util/ui/ListView.java +++ b/source/net/filebot/util/ui/ListView.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import static java.lang.Math.*; diff --git a/source/net/filebot/util/ui/LoadingOverlayPane.java b/source/net/filebot/util/ui/LoadingOverlayPane.java index c548dcdf..0a486845 100644 --- a/source/net/filebot/util/ui/LoadingOverlayPane.java +++ b/source/net/filebot/util/ui/LoadingOverlayPane.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.beans.PropertyChangeEvent; diff --git a/source/net/filebot/util/ui/NullLabelProvider.java b/source/net/filebot/util/ui/NullLabelProvider.java index e61ca39c..6c13bff0 100644 --- a/source/net/filebot/util/ui/NullLabelProvider.java +++ b/source/net/filebot/util/ui/NullLabelProvider.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import javax.swing.Icon; diff --git a/source/net/filebot/util/ui/ProgressDialog.java b/source/net/filebot/util/ui/ProgressDialog.java index c4998cc5..8aceb603 100644 --- a/source/net/filebot/util/ui/ProgressDialog.java +++ b/source/net/filebot/util/ui/ProgressDialog.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Window; diff --git a/source/net/filebot/util/ui/ProgressIndicator.java b/source/net/filebot/util/ui/ProgressIndicator.java index 9a48ec6b..99c66e02 100644 --- a/source/net/filebot/util/ui/ProgressIndicator.java +++ b/source/net/filebot/util/ui/ProgressIndicator.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.BasicStroke; diff --git a/source/net/filebot/util/ui/RoundBorder.java b/source/net/filebot/util/ui/RoundBorder.java index e74ecab0..0dd9cf9b 100644 --- a/source/net/filebot/util/ui/RoundBorder.java +++ b/source/net/filebot/util/ui/RoundBorder.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/SelectButton.java b/source/net/filebot/util/ui/SelectButton.java index 4340cc5e..618661e4 100644 --- a/source/net/filebot/util/ui/SelectButton.java +++ b/source/net/filebot/util/ui/SelectButton.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; import java.awt.Component; diff --git a/source/net/filebot/util/ui/ShadowBorder.java b/source/net/filebot/util/ui/ShadowBorder.java index 3e77d069..7da15af2 100644 --- a/source/net/filebot/util/ui/ShadowBorder.java +++ b/source/net/filebot/util/ui/ShadowBorder.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.awt.Color; diff --git a/source/net/filebot/util/ui/SimpleLabelProvider.java b/source/net/filebot/util/ui/SimpleLabelProvider.java index e3d1c944..91add07c 100644 --- a/source/net/filebot/util/ui/SimpleLabelProvider.java +++ b/source/net/filebot/util/ui/SimpleLabelProvider.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.lang.reflect.Method; @@ -7,7 +7,7 @@ import java.util.Arrays; import javax.swing.Icon; -import net.sourceforge.filebot.util.ExceptionUtilities; +import net.filebot.util.ExceptionUtilities; /** diff --git a/source/net/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java b/source/net/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java index b6f01fb0..529081d5 100644 --- a/source/net/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java +++ b/source/net/filebot/util/ui/SwingWorkerPropertyChangeAdapter.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import java.beans.PropertyChangeEvent; diff --git a/source/net/filebot/util/ui/TunedUtilities.java b/source/net/filebot/util/ui/TunedUtilities.java index 92f11656..372cb5eb 100644 --- a/source/net/filebot/util/ui/TunedUtilities.java +++ b/source/net/filebot/util/ui/TunedUtilities.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.util.ui; +package net.filebot.util.ui; import static java.util.Collections.*; import static javax.swing.JOptionPane.*; diff --git a/source/net/filebot/util/ui/notification/Direction.java b/source/net/filebot/util/ui/notification/Direction.java index efb5b737..a3e86864 100644 --- a/source/net/filebot/util/ui/notification/Direction.java +++ b/source/net/filebot/util/ui/notification/Direction.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; import javax.swing.SwingConstants; diff --git a/source/net/filebot/util/ui/notification/MessageNotification.java b/source/net/filebot/util/ui/notification/MessageNotification.java index ccddec03..4b345d2f 100644 --- a/source/net/filebot/util/ui/notification/MessageNotification.java +++ b/source/net/filebot/util/ui/notification/MessageNotification.java @@ -2,7 +2,7 @@ * Created on 16.03.2005 */ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; import java.awt.BorderLayout; diff --git a/source/net/filebot/util/ui/notification/NotificationLayout.java b/source/net/filebot/util/ui/notification/NotificationLayout.java index 16a7ce23..801aabb6 100644 --- a/source/net/filebot/util/ui/notification/NotificationLayout.java +++ b/source/net/filebot/util/ui/notification/NotificationLayout.java @@ -2,7 +2,7 @@ * Created on 19.03.2005 */ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; public interface NotificationLayout { diff --git a/source/net/filebot/util/ui/notification/NotificationManager.java b/source/net/filebot/util/ui/notification/NotificationManager.java index 80427623..9d3b057a 100644 --- a/source/net/filebot/util/ui/notification/NotificationManager.java +++ b/source/net/filebot/util/ui/notification/NotificationManager.java @@ -2,13 +2,13 @@ * Created on 19.03.2005 */ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.util.ui.TunedUtilities; public class NotificationManager { diff --git a/source/net/filebot/util/ui/notification/NotificationWindow.java b/source/net/filebot/util/ui/notification/NotificationWindow.java index 1262f541..04a1d6af 100644 --- a/source/net/filebot/util/ui/notification/NotificationWindow.java +++ b/source/net/filebot/util/ui/notification/NotificationWindow.java @@ -2,7 +2,7 @@ * Created on 19.03.2005 */ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; import java.awt.Window; @@ -16,7 +16,7 @@ import java.awt.event.WindowEvent; import javax.swing.JWindow; import javax.swing.Timer; -import net.sourceforge.filebot.util.ui.TunedUtilities; +import net.filebot.util.ui.TunedUtilities; public class NotificationWindow extends JWindow { diff --git a/source/net/filebot/util/ui/notification/QueueNotificationLayout.java b/source/net/filebot/util/ui/notification/QueueNotificationLayout.java index a0dea517..1a10ca8f 100644 --- a/source/net/filebot/util/ui/notification/QueueNotificationLayout.java +++ b/source/net/filebot/util/ui/notification/QueueNotificationLayout.java @@ -2,10 +2,10 @@ * Created on 19.03.2005 */ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; -import static net.sourceforge.filebot.util.ui.notification.Direction.*; +import static net.filebot.util.ui.notification.Direction.*; import java.awt.Dimension; import java.awt.GraphicsConfiguration; diff --git a/source/net/filebot/util/ui/notification/SeparatorBorder.java b/source/net/filebot/util/ui/notification/SeparatorBorder.java index e55d390b..53e4c752 100644 --- a/source/net/filebot/util/ui/notification/SeparatorBorder.java +++ b/source/net/filebot/util/ui/notification/SeparatorBorder.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; import java.awt.Color; @@ -12,7 +12,7 @@ import java.awt.geom.RectangularShape; import javax.swing.border.AbstractBorder; -import net.sourceforge.filebot.util.ui.GradientStyle; +import net.filebot.util.ui.GradientStyle; public class SeparatorBorder extends AbstractBorder { diff --git a/source/net/filebot/util/ui/notification/SimpleNotificationLayout.java b/source/net/filebot/util/ui/notification/SimpleNotificationLayout.java index 593c2bcc..e23c22b6 100644 --- a/source/net/filebot/util/ui/notification/SimpleNotificationLayout.java +++ b/source/net/filebot/util/ui/notification/SimpleNotificationLayout.java @@ -2,10 +2,10 @@ * Created on 20.03.2005 */ -package net.sourceforge.filebot.util.ui.notification; +package net.filebot.util.ui.notification; -import static net.sourceforge.filebot.util.ui.notification.Direction.*; +import static net.filebot.util.ui.notification.Direction.*; import java.awt.Dimension; import java.awt.Insets; diff --git a/source/net/filebot/vfs/ArchiveType.java b/source/net/filebot/vfs/ArchiveType.java index 838e39a9..4501477f 100644 --- a/source/net/filebot/vfs/ArchiveType.java +++ b/source/net/filebot/vfs/ArchiveType.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.vfs; +package net.filebot.vfs; import java.nio.ByteBuffer; diff --git a/source/net/filebot/vfs/FileInfo.java b/source/net/filebot/vfs/FileInfo.java index 97fd7fe7..d3faa101 100644 --- a/source/net/filebot/vfs/FileInfo.java +++ b/source/net/filebot/vfs/FileInfo.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.vfs; +package net.filebot.vfs; import java.io.File; diff --git a/source/net/filebot/vfs/MemoryFile.java b/source/net/filebot/vfs/MemoryFile.java index 214713e9..23b27b0d 100644 --- a/source/net/filebot/vfs/MemoryFile.java +++ b/source/net/filebot/vfs/MemoryFile.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.vfs; +package net.filebot.vfs; import java.nio.ByteBuffer; diff --git a/source/net/filebot/vfs/RarArchive.java b/source/net/filebot/vfs/RarArchive.java index 9806fca6..ddc3dd75 100644 --- a/source/net/filebot/vfs/RarArchive.java +++ b/source/net/filebot/vfs/RarArchive.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.vfs; +package net.filebot.vfs; import java.io.IOException; @@ -10,7 +10,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.util.ByteBufferOutputStream; +import net.filebot.util.ByteBufferOutputStream; import de.innosystec.unrar.Archive; import de.innosystec.unrar.exception.RarException; import de.innosystec.unrar.rarfile.FileHeader; diff --git a/source/net/filebot/vfs/SimpleFileInfo.java b/source/net/filebot/vfs/SimpleFileInfo.java index 84e6a981..c4572231 100644 --- a/source/net/filebot/vfs/SimpleFileInfo.java +++ b/source/net/filebot/vfs/SimpleFileInfo.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.vfs; +package net.filebot.vfs; -import static net.sourceforge.filebot.util.FileUtilities.*; +import static net.filebot.util.FileUtilities.*; import java.io.File; import java.util.Arrays; diff --git a/source/net/filebot/vfs/ZipArchive.java b/source/net/filebot/vfs/ZipArchive.java index 03570f39..b3cc0e44 100644 --- a/source/net/filebot/vfs/ZipArchive.java +++ b/source/net/filebot/vfs/ZipArchive.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.vfs; +package net.filebot.vfs; import java.io.IOException; @@ -10,8 +10,8 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import net.sourceforge.filebot.util.ByteBufferInputStream; -import net.sourceforge.filebot.util.ByteBufferOutputStream; +import net.filebot.util.ByteBufferInputStream; +import net.filebot.util.ByteBufferOutputStream; public class ZipArchive implements Iterable { diff --git a/source/net/filebot/web/AbstractCachedResource.java b/source/net/filebot/web/AbstractCachedResource.java index d070c021..8e920582 100644 --- a/source/net/filebot/web/AbstractCachedResource.java +++ b/source/net/filebot/web/AbstractCachedResource.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/source/net/filebot/web/AbstractEpisodeListProvider.java b/source/net/filebot/web/AbstractEpisodeListProvider.java index fe1184ee..94e28bd3 100644 --- a/source/net/filebot/web/AbstractEpisodeListProvider.java +++ b/source/net/filebot/web/AbstractEpisodeListProvider.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.util.Arrays; import java.util.List; @@ -6,8 +6,8 @@ import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.Cache.Key; +import net.filebot.Cache; +import net.filebot.Cache.Key; public abstract class AbstractEpisodeListProvider implements EpisodeListProvider { diff --git a/source/net/filebot/web/AcoustIDClient.java b/source/net/filebot/web/AcoustIDClient.java index ee7a8a1c..da2609f1 100644 --- a/source/net/filebot/web/AcoustIDClient.java +++ b/source/net/filebot/web/AcoustIDClient.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Collections.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.web.WebRequest.*; import java.io.File; import java.io.IOException; @@ -22,8 +22,8 @@ import java.util.logging.Logger; import javax.swing.Icon; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.ResourceManager; +import net.filebot.Cache; +import net.filebot.ResourceManager; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; @@ -157,7 +157,7 @@ public class AcoustIDClient implements MusicIdentificationService { public String getChromaprintCommand() { // use fpcalc executable path as specified by the cmdline or default to "fpcalc" and let the shell figure it out - return System.getProperty("net.sourceforge.filebot.AcoustID.fpcalc", "fpcalc"); + return System.getProperty("net.filebot.AcoustID.fpcalc", "fpcalc"); } public List> fpcalc(Iterable files) throws IOException, InterruptedException { diff --git a/source/net/filebot/web/AnidbClient.java b/source/net/filebot/web/AnidbClient.java index ac204f2f..958c6d25 100644 --- a/source/net/filebot/web/AnidbClient.java +++ b/source/net/filebot/web/AnidbClient.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.util.XPathUtilities.*; -import static net.sourceforge.filebot.web.EpisodeUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.util.XPathUtilities.*; +import static net.filebot.web.EpisodeUtilities.*; +import static net.filebot.web.WebRequest.*; import java.net.URI; import java.net.URISyntaxException; @@ -26,8 +26,8 @@ import java.util.zip.GZIPInputStream; import javax.swing.Icon; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.ResourceManager; +import net.filebot.Cache; +import net.filebot.ResourceManager; import org.jsoup.Jsoup; import org.w3c.dom.Document; diff --git a/source/net/filebot/web/AnidbSearchResult.java b/source/net/filebot/web/AnidbSearchResult.java index 132c5b12..5721d605 100644 --- a/source/net/filebot/web/AnidbSearchResult.java +++ b/source/net/filebot/web/AnidbSearchResult.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; public class AnidbSearchResult extends SearchResult { diff --git a/source/net/filebot/web/AudioTrack.java b/source/net/filebot/web/AudioTrack.java index 83232a84..cc16c94b 100644 --- a/source/net/filebot/web/AudioTrack.java +++ b/source/net/filebot/web/AudioTrack.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.Serializable; diff --git a/source/net/filebot/web/AudioTrackFormat.java b/source/net/filebot/web/AudioTrackFormat.java index aeeb78b0..d39ddbd4 100644 --- a/source/net/filebot/web/AudioTrackFormat.java +++ b/source/net/filebot/web/AudioTrackFormat.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.text.FieldPosition; diff --git a/source/net/filebot/web/CachedPage.java b/source/net/filebot/web/CachedPage.java index 0d57eae9..c2c08acd 100644 --- a/source/net/filebot/web/CachedPage.java +++ b/source/net/filebot/web/CachedPage.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.web.WebRequest.*; import java.io.IOException; import java.io.Reader; diff --git a/source/net/filebot/web/CachedResource.java b/source/net/filebot/web/CachedResource.java index f710fbe0..0959ae83 100644 --- a/source/net/filebot/web/CachedResource.java +++ b/source/net/filebot/web/CachedResource.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.IOException; import java.io.Serializable; diff --git a/source/net/filebot/web/CachedXmlResource.java b/source/net/filebot/web/CachedXmlResource.java index bf871c37..58428fc4 100644 --- a/source/net/filebot/web/CachedXmlResource.java +++ b/source/net/filebot/web/CachedXmlResource.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.IOException; import java.io.StringReader; diff --git a/source/net/filebot/web/ETagCachedResource.java b/source/net/filebot/web/ETagCachedResource.java index ace6186d..3f468d6c 100644 --- a/source/net/filebot/web/ETagCachedResource.java +++ b/source/net/filebot/web/ETagCachedResource.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.IOException; import java.io.Serializable; diff --git a/source/net/filebot/web/Episode.java b/source/net/filebot/web/Episode.java index 2abbc2a8..d1cbb140 100644 --- a/source/net/filebot/web/Episode.java +++ b/source/net/filebot/web/Episode.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.Serializable; import java.util.Arrays; diff --git a/source/net/filebot/web/EpisodeFormat.java b/source/net/filebot/web/EpisodeFormat.java index 301a9f7f..68dceb37 100644 --- a/source/net/filebot/web/EpisodeFormat.java +++ b/source/net/filebot/web/EpisodeFormat.java @@ -1,6 +1,6 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.text.FieldPosition; import java.text.Format; diff --git a/source/net/filebot/web/EpisodeListProvider.java b/source/net/filebot/web/EpisodeListProvider.java index 155c631e..865e059b 100644 --- a/source/net/filebot/web/EpisodeListProvider.java +++ b/source/net/filebot/web/EpisodeListProvider.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.net.URI; diff --git a/source/net/filebot/web/EpisodeUtilities.java b/source/net/filebot/web/EpisodeUtilities.java index 3ec7b230..149efc7c 100644 --- a/source/net/filebot/web/EpisodeUtilities.java +++ b/source/net/filebot/web/EpisodeUtilities.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.util.ArrayList; diff --git a/source/net/filebot/web/FanartTVClient.java b/source/net/filebot/web/FanartTVClient.java index 9a3f2d38..b7104380 100644 --- a/source/net/filebot/web/FanartTVClient.java +++ b/source/net/filebot/web/FanartTVClient.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.util.XPathUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.util.XPathUtilities.*; +import static net.filebot.web.WebRequest.*; import java.io.File; import java.io.Serializable; @@ -18,7 +18,7 @@ import java.util.Map; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; -import net.sourceforge.filebot.web.FanartTVClient.FanartDescriptor.FanartProperty; +import net.filebot.web.FanartTVClient.FanartDescriptor.FanartProperty; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/source/net/filebot/web/FloodLimit.java b/source/net/filebot/web/FloodLimit.java index 0beab143..e0501257 100644 --- a/source/net/filebot/web/FloodLimit.java +++ b/source/net/filebot/web/FloodLimit.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/source/net/filebot/web/HyperLink.java b/source/net/filebot/web/HyperLink.java index 23735d2c..0417df19 100644 --- a/source/net/filebot/web/HyperLink.java +++ b/source/net/filebot/web/HyperLink.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.net.URI; import java.net.URISyntaxException; diff --git a/source/net/filebot/web/ID3Lookup.java b/source/net/filebot/web/ID3Lookup.java index 326535f2..ba6c3b9c 100644 --- a/source/net/filebot/web/ID3Lookup.java +++ b/source/net/filebot/web/ID3Lookup.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.File; import java.io.IOException; @@ -10,9 +10,9 @@ import java.util.logging.Logger; import javax.swing.Icon; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.mediainfo.MediaInfo; -import net.sourceforge.filebot.mediainfo.MediaInfo.StreamKind; +import net.filebot.ResourceManager; +import net.filebot.mediainfo.MediaInfo; +import net.filebot.mediainfo.MediaInfo.StreamKind; public class ID3Lookup implements MusicIdentificationService { diff --git a/source/net/filebot/web/IMDbClient.java b/source/net/filebot/web/IMDbClient.java index 23b2ca88..074745d6 100644 --- a/source/net/filebot/web/IMDbClient.java +++ b/source/net/filebot/web/IMDbClient.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.util.XPathUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.util.XPathUtilities.*; +import static net.filebot.web.WebRequest.*; import java.io.File; import java.io.FileNotFoundException; @@ -26,11 +26,11 @@ import javax.swing.Icon; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.web.TMDbClient.MovieInfo; -import net.sourceforge.filebot.web.TMDbClient.MovieInfo.MovieProperty; -import net.sourceforge.filebot.web.TMDbClient.Person; -import net.sourceforge.filebot.web.TMDbClient.Trailer; +import net.filebot.ResourceManager; +import net.filebot.web.TMDbClient.MovieInfo; +import net.filebot.web.TMDbClient.MovieInfo.MovieProperty; +import net.filebot.web.TMDbClient.Person; +import net.filebot.web.TMDbClient.Trailer; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/source/net/filebot/web/LocalSearch.java b/source/net/filebot/web/LocalSearch.java index 8a2353c8..a5f591f7 100644 --- a/source/net/filebot/web/LocalSearch.java +++ b/source/net/filebot/web/LocalSearch.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Collections.*; -import static net.sourceforge.filebot.similarity.Normalization.*; +import static net.filebot.similarity.Normalization.*; import java.util.AbstractList; import java.util.AbstractMap.SimpleEntry; diff --git a/source/net/filebot/web/Movie.java b/source/net/filebot/web/Movie.java index 4fdcedd3..1380a72a 100644 --- a/source/net/filebot/web/Movie.java +++ b/source/net/filebot/web/Movie.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.util.ArrayList; import java.util.Collections; diff --git a/source/net/filebot/web/MovieFormat.java b/source/net/filebot/web/MovieFormat.java index 1c358b43..89f75dcb 100644 --- a/source/net/filebot/web/MovieFormat.java +++ b/source/net/filebot/web/MovieFormat.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.text.FieldPosition; diff --git a/source/net/filebot/web/MovieIdentificationService.java b/source/net/filebot/web/MovieIdentificationService.java index cd49dd65..71e0a6ee 100644 --- a/source/net/filebot/web/MovieIdentificationService.java +++ b/source/net/filebot/web/MovieIdentificationService.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.File; diff --git a/source/net/filebot/web/MoviePart.java b/source/net/filebot/web/MoviePart.java index 8fb29be8..b84cb13b 100644 --- a/source/net/filebot/web/MoviePart.java +++ b/source/net/filebot/web/MoviePart.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; public class MoviePart extends Movie { diff --git a/source/net/filebot/web/MultiEpisode.java b/source/net/filebot/web/MultiEpisode.java index 77bba451..6fd1d4aa 100644 --- a/source/net/filebot/web/MultiEpisode.java +++ b/source/net/filebot/web/MultiEpisode.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Arrays.*; import static java.util.Collections.*; diff --git a/source/net/filebot/web/MusicIdentificationService.java b/source/net/filebot/web/MusicIdentificationService.java index a3fc6f8e..679a1673 100644 --- a/source/net/filebot/web/MusicIdentificationService.java +++ b/source/net/filebot/web/MusicIdentificationService.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.File; diff --git a/source/net/filebot/web/OpenSubtitlesClient.java b/source/net/filebot/web/OpenSubtitlesClient.java index 335cab6b..dc714374 100644 --- a/source/net/filebot/web/OpenSubtitlesClient.java +++ b/source/net/filebot/web/OpenSubtitlesClient.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.lang.Math.*; import static java.util.Arrays.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.util.FileUtilities.*; -import static net.sourceforge.filebot.web.OpenSubtitlesHasher.*; +import static net.filebot.util.FileUtilities.*; +import static net.filebot.web.OpenSubtitlesHasher.*; import java.io.File; import java.io.IOException; @@ -30,17 +30,17 @@ import java.util.logging.Logger; import javax.swing.Icon; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.Cache.Key; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.mediainfo.MediaInfo; -import net.sourceforge.filebot.mediainfo.MediaInfo.StreamKind; -import net.sourceforge.filebot.util.ExceptionUtilities; -import net.sourceforge.filebot.util.Timer; -import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.BaseInfo; -import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.Query; -import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.SubFile; -import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.TryUploadResponse; +import net.filebot.Cache; +import net.filebot.Cache.Key; +import net.filebot.ResourceManager; +import net.filebot.mediainfo.MediaInfo; +import net.filebot.mediainfo.MediaInfo.StreamKind; +import net.filebot.util.ExceptionUtilities; +import net.filebot.util.Timer; +import net.filebot.web.OpenSubtitlesXmlRpc.BaseInfo; +import net.filebot.web.OpenSubtitlesXmlRpc.Query; +import net.filebot.web.OpenSubtitlesXmlRpc.SubFile; +import net.filebot.web.OpenSubtitlesXmlRpc.TryUploadResponse; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcFault; diff --git a/source/net/filebot/web/OpenSubtitlesHasher.java b/source/net/filebot/web/OpenSubtitlesHasher.java index 8220d14e..7ceeefe4 100644 --- a/source/net/filebot/web/OpenSubtitlesHasher.java +++ b/source/net/filebot/web/OpenSubtitlesHasher.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.DataInputStream; diff --git a/source/net/filebot/web/OpenSubtitlesSubtitleDescriptor.java b/source/net/filebot/web/OpenSubtitlesSubtitleDescriptor.java index 1986bd32..46eeca27 100644 --- a/source/net/filebot/web/OpenSubtitlesSubtitleDescriptor.java +++ b/source/net/filebot/web/OpenSubtitlesSubtitleDescriptor.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.File; import java.io.IOException; @@ -12,8 +12,8 @@ import java.util.Map.Entry; import java.util.zip.GZIPInputStream; import java.util.zip.ZipException; -import net.sourceforge.filebot.util.ByteBufferOutputStream; -import net.sourceforge.filebot.util.FileUtilities; +import net.filebot.util.ByteBufferOutputStream; +import net.filebot.util.FileUtilities; /** * Describes a subtitle on OpenSubtitles. diff --git a/source/net/filebot/web/OpenSubtitlesXmlRpc.java b/source/net/filebot/web/OpenSubtitlesXmlRpc.java index 9794a76d..819ffad9 100644 --- a/source/net/filebot/web/OpenSubtitlesXmlRpc.java +++ b/source/net/filebot/web/OpenSubtitlesXmlRpc.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Collections.*; -import static net.sourceforge.filebot.util.StringUtilities.*; +import static net.filebot.util.StringUtilities.*; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -25,8 +25,8 @@ import java.util.regex.Pattern; import java.util.zip.DeflaterInputStream; import java.util.zip.GZIPInputStream; -import net.sourceforge.filebot.util.ByteBufferOutputStream; -import net.sourceforge.filebot.web.OpenSubtitlesSubtitleDescriptor.Property; +import net.filebot.util.ByteBufferOutputStream; +import net.filebot.web.OpenSubtitlesSubtitleDescriptor.Property; import redstone.xmlrpc.XmlRpcClient; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcFault; diff --git a/source/net/filebot/web/SearchResult.java b/source/net/filebot/web/SearchResult.java index b6292edc..ceb5428c 100644 --- a/source/net/filebot/web/SearchResult.java +++ b/source/net/filebot/web/SearchResult.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.Serializable; import java.util.AbstractList; diff --git a/source/net/filebot/web/SeasonOutOfBoundsException.java b/source/net/filebot/web/SeasonOutOfBoundsException.java index 429ddb3d..3ea2e448 100644 --- a/source/net/filebot/web/SeasonOutOfBoundsException.java +++ b/source/net/filebot/web/SeasonOutOfBoundsException.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; public class SeasonOutOfBoundsException extends IndexOutOfBoundsException { diff --git a/source/net/filebot/web/SerienjunkiesClient.java b/source/net/filebot/web/SerienjunkiesClient.java index 25d47628..c405e2e4 100644 --- a/source/net/filebot/web/SerienjunkiesClient.java +++ b/source/net/filebot/web/SerienjunkiesClient.java @@ -1,7 +1,7 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.web.EpisodeUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.web.EpisodeUtilities.*; +import static net.filebot.web.WebRequest.*; import java.io.IOException; import java.io.Reader; @@ -16,8 +16,8 @@ import java.util.Set; import javax.net.ssl.HttpsURLConnection; import javax.swing.Icon; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.ResourceManager; +import net.filebot.Cache; +import net.filebot.ResourceManager; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/source/net/filebot/web/SerienjunkiesSearchResult.java b/source/net/filebot/web/SerienjunkiesSearchResult.java index 7f08f30a..e227e0f6 100644 --- a/source/net/filebot/web/SerienjunkiesSearchResult.java +++ b/source/net/filebot/web/SerienjunkiesSearchResult.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; public class SerienjunkiesSearchResult extends SearchResult { diff --git a/source/net/filebot/web/SimpleDate.java b/source/net/filebot/web/SimpleDate.java index 006e30f7..f016ead6 100644 --- a/source/net/filebot/web/SimpleDate.java +++ b/source/net/filebot/web/SimpleDate.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Calendar.*; diff --git a/source/net/filebot/web/SortOrder.java b/source/net/filebot/web/SortOrder.java index 247cce61..a3f653b6 100644 --- a/source/net/filebot/web/SortOrder.java +++ b/source/net/filebot/web/SortOrder.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; public enum SortOrder { diff --git a/source/net/filebot/web/SubtitleDescriptor.java b/source/net/filebot/web/SubtitleDescriptor.java index 14f82013..6dac49b2 100644 --- a/source/net/filebot/web/SubtitleDescriptor.java +++ b/source/net/filebot/web/SubtitleDescriptor.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.nio.ByteBuffer; -import net.sourceforge.filebot.vfs.FileInfo; +import net.filebot.vfs.FileInfo; public interface SubtitleDescriptor extends FileInfo { diff --git a/source/net/filebot/web/SubtitleProvider.java b/source/net/filebot/web/SubtitleProvider.java index 2a3b61dc..c0c6b69b 100644 --- a/source/net/filebot/web/SubtitleProvider.java +++ b/source/net/filebot/web/SubtitleProvider.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.net.URI; diff --git a/source/net/filebot/web/TMDbClient.java b/source/net/filebot/web/TMDbClient.java index 278956c5..35e9d353 100644 --- a/source/net/filebot/web/TMDbClient.java +++ b/source/net/filebot/web/TMDbClient.java @@ -1,8 +1,8 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Arrays.*; import static java.util.Collections.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.web.WebRequest.*; import java.io.File; import java.io.FileNotFoundException; @@ -29,9 +29,9 @@ import java.util.logging.Logger; import javax.swing.Icon; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.web.TMDbClient.MovieInfo.MovieProperty; -import net.sourceforge.filebot.web.TMDbClient.Person.PersonProperty; +import net.filebot.ResourceManager; +import net.filebot.web.TMDbClient.MovieInfo.MovieProperty; +import net.filebot.web.TMDbClient.Person.PersonProperty; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/source/net/filebot/web/TVRageClient.java b/source/net/filebot/web/TVRageClient.java index 0c14c325..b9d4d83d 100644 --- a/source/net/filebot/web/TVRageClient.java +++ b/source/net/filebot/web/TVRageClient.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.util.XPathUtilities.*; -import static net.sourceforge.filebot.web.EpisodeUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.util.XPathUtilities.*; +import static net.filebot.web.EpisodeUtilities.*; +import static net.filebot.web.WebRequest.*; import java.io.IOException; import java.net.URI; @@ -15,8 +15,8 @@ import java.util.Locale; import javax.swing.Icon; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.ResourceManager; +import net.filebot.Cache; +import net.filebot.ResourceManager; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/source/net/filebot/web/TVRageSearchResult.java b/source/net/filebot/web/TVRageSearchResult.java index 38cf4c61..65b0dcfd 100644 --- a/source/net/filebot/web/TVRageSearchResult.java +++ b/source/net/filebot/web/TVRageSearchResult.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; public class TVRageSearchResult extends SearchResult { diff --git a/source/net/filebot/web/TheTVDBClient.java b/source/net/filebot/web/TheTVDBClient.java index 2c22ef55..66e0f8c1 100644 --- a/source/net/filebot/web/TheTVDBClient.java +++ b/source/net/filebot/web/TheTVDBClient.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Arrays.*; -import static net.sourceforge.filebot.util.XPathUtilities.*; -import static net.sourceforge.filebot.web.EpisodeUtilities.*; -import static net.sourceforge.filebot.web.WebRequest.*; +import static net.filebot.util.XPathUtilities.*; +import static net.filebot.web.EpisodeUtilities.*; +import static net.filebot.web.WebRequest.*; import java.io.FileNotFoundException; import java.io.IOException; @@ -25,11 +25,11 @@ import java.util.logging.Logger; import javax.swing.Icon; -import net.sourceforge.filebot.Cache; -import net.sourceforge.filebot.ResourceManager; -import net.sourceforge.filebot.util.FileUtilities; -import net.sourceforge.filebot.web.TheTVDBClient.BannerDescriptor.BannerProperty; -import net.sourceforge.filebot.web.TheTVDBClient.SeriesInfo.SeriesProperty; +import net.filebot.Cache; +import net.filebot.ResourceManager; +import net.filebot.util.FileUtilities; +import net.filebot.web.TheTVDBClient.BannerDescriptor.BannerProperty; +import net.filebot.web.TheTVDBClient.SeriesInfo.SeriesProperty; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/source/net/filebot/web/TheTVDBSearchResult.java b/source/net/filebot/web/TheTVDBSearchResult.java index fe973091..131f54f8 100644 --- a/source/net/filebot/web/TheTVDBSearchResult.java +++ b/source/net/filebot/web/TheTVDBSearchResult.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; public class TheTVDBSearchResult extends SearchResult { diff --git a/source/net/filebot/web/VideoHashSubtitleService.java b/source/net/filebot/web/VideoHashSubtitleService.java index 92f67d5d..0cf7222a 100644 --- a/source/net/filebot/web/VideoHashSubtitleService.java +++ b/source/net/filebot/web/VideoHashSubtitleService.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.File; import java.net.URI; diff --git a/source/net/filebot/web/WebRequest.java b/source/net/filebot/web/WebRequest.java index ac190d10..2f40aa22 100644 --- a/source/net/filebot/web/WebRequest.java +++ b/source/net/filebot/web/WebRequest.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import java.io.IOException; import java.io.InputStream; @@ -34,7 +34,7 @@ import javax.net.ssl.X509TrustManager; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import net.sourceforge.filebot.util.ByteBufferOutputStream; +import net.filebot.util.ByteBufferOutputStream; import org.cyberneko.html.parsers.DOMParser; import org.w3c.dom.Document; diff --git a/test/net/filebot/AllTests.java b/test/net/filebot/AllTests.java index 346e493f..6ddabfa5 100644 --- a/test/net/filebot/AllTests.java +++ b/test/net/filebot/AllTests.java @@ -1,14 +1,14 @@ -package net.sourceforge.filebot; +package net.filebot; -import net.sourceforge.filebot.format.ExpressionFormatTest; -import net.sourceforge.filebot.hash.VerificationFormatTest; -import net.sourceforge.filebot.media.ReleaseInfoTest; -import net.sourceforge.filebot.similarity.EpisodeMetricsTest; -import net.sourceforge.filebot.similarity.SimilarityTestSuite; -import net.sourceforge.filebot.subtitle.SubtitleReaderTestSuite; -import net.sourceforge.filebot.ui.rename.MatchModelTest; -import net.sourceforge.filebot.util.UtilTestSuite; -import net.sourceforge.filebot.web.WebTestSuite; +import net.filebot.format.ExpressionFormatTest; +import net.filebot.hash.VerificationFormatTest; +import net.filebot.media.ReleaseInfoTest; +import net.filebot.similarity.EpisodeMetricsTest; +import net.filebot.similarity.SimilarityTestSuite; +import net.filebot.subtitle.SubtitleReaderTestSuite; +import net.filebot.ui.rename.MatchModelTest; +import net.filebot.util.UtilTestSuite; +import net.filebot.web.WebTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/test/net/filebot/format/ExpressionFormatTest.java b/test/net/filebot/format/ExpressionFormatTest.java index d14b0a10..7caa256e 100644 --- a/test/net/filebot/format/ExpressionFormatTest.java +++ b/test/net/filebot/format/ExpressionFormatTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.format; +package net.filebot.format; import static org.junit.Assert.*; diff --git a/test/net/filebot/hash/VerificationFormatTest.java b/test/net/filebot/hash/VerificationFormatTest.java index 785f7a51..60f07c3f 100644 --- a/test/net/filebot/hash/VerificationFormatTest.java +++ b/test/net/filebot/hash/VerificationFormatTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.hash; +package net.filebot.hash; import static org.junit.Assert.*; diff --git a/test/net/filebot/media/ReleaseInfoTest.java b/test/net/filebot/media/ReleaseInfoTest.java index af8a2bbb..8db64699 100644 --- a/test/net/filebot/media/ReleaseInfoTest.java +++ b/test/net/filebot/media/ReleaseInfoTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.media; +package net.filebot.media; import static org.junit.Assert.*; diff --git a/test/net/filebot/similarity/DateMetricTest.java b/test/net/filebot/similarity/DateMetricTest.java index 86a13f6b..1d9080c2 100644 --- a/test/net/filebot/similarity/DateMetricTest.java +++ b/test/net/filebot/similarity/DateMetricTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static org.junit.Assert.*; diff --git a/test/net/filebot/similarity/EpisodeMetricsTest.java b/test/net/filebot/similarity/EpisodeMetricsTest.java index fe7b3e88..94d81218 100644 --- a/test/net/filebot/similarity/EpisodeMetricsTest.java +++ b/test/net/filebot/similarity/EpisodeMetricsTest.java @@ -1,15 +1,15 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; -import static net.sourceforge.filebot.similarity.EpisodeMetrics.*; +import static net.filebot.similarity.EpisodeMetrics.*; import static org.junit.Assert.*; import java.io.File; import java.util.ArrayList; import java.util.List; -import net.sourceforge.filebot.web.SimpleDate; -import net.sourceforge.filebot.web.Episode; -import net.sourceforge.filebot.web.TheTVDBSearchResult; +import net.filebot.web.SimpleDate; +import net.filebot.web.Episode; +import net.filebot.web.TheTVDBSearchResult; import org.junit.Test; diff --git a/test/net/filebot/similarity/NameSimilarityMetricTest.java b/test/net/filebot/similarity/NameSimilarityMetricTest.java index c8ab0ef2..bd7b4320 100644 --- a/test/net/filebot/similarity/NameSimilarityMetricTest.java +++ b/test/net/filebot/similarity/NameSimilarityMetricTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static org.junit.Assert.*; diff --git a/test/net/filebot/similarity/NumericSimilarityMetricTest.java b/test/net/filebot/similarity/NumericSimilarityMetricTest.java index 8dda3364..dc000ad2 100644 --- a/test/net/filebot/similarity/NumericSimilarityMetricTest.java +++ b/test/net/filebot/similarity/NumericSimilarityMetricTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static org.junit.Assert.*; @@ -8,7 +8,7 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; -import net.sourceforge.filebot.util.TestUtil; +import net.filebot.util.TestUtil; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/test/net/filebot/similarity/SeasonEpisodeMatcherTest.java b/test/net/filebot/similarity/SeasonEpisodeMatcherTest.java index aa40054e..b9a38315 100644 --- a/test/net/filebot/similarity/SeasonEpisodeMatcherTest.java +++ b/test/net/filebot/similarity/SeasonEpisodeMatcherTest.java @@ -1,10 +1,10 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static java.util.Arrays.*; -import static net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE.*; +import static net.filebot.similarity.SeasonEpisodeMatcher.SxE.*; import static org.junit.Assert.*; -import net.sourceforge.filebot.media.MediaDetection; -import net.sourceforge.filebot.similarity.SeasonEpisodeMatcher.SxE; +import net.filebot.media.MediaDetection; +import net.filebot.similarity.SeasonEpisodeMatcher.SxE; import org.junit.Test; diff --git a/test/net/filebot/similarity/SeasonEpisodeMetricTest.java b/test/net/filebot/similarity/SeasonEpisodeMetricTest.java index 1bccfe05..392c41b2 100644 --- a/test/net/filebot/similarity/SeasonEpisodeMetricTest.java +++ b/test/net/filebot/similarity/SeasonEpisodeMetricTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static org.junit.Assert.*; diff --git a/test/net/filebot/similarity/SeriesNameMatcherTest.java b/test/net/filebot/similarity/SeriesNameMatcherTest.java index 643fda5e..3a0ff2b4 100644 --- a/test/net/filebot/similarity/SeriesNameMatcherTest.java +++ b/test/net/filebot/similarity/SeriesNameMatcherTest.java @@ -1,9 +1,9 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import static org.junit.Assert.*; -import net.sourceforge.filebot.similarity.SeriesNameMatcher.SeriesNameCollection; +import net.filebot.similarity.SeriesNameMatcher.SeriesNameCollection; import org.junit.Test; diff --git a/test/net/filebot/similarity/SimilarityTestSuite.java b/test/net/filebot/similarity/SimilarityTestSuite.java index 5649412e..b0f1c054 100644 --- a/test/net/filebot/similarity/SimilarityTestSuite.java +++ b/test/net/filebot/similarity/SimilarityTestSuite.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.similarity; +package net.filebot.similarity; import org.junit.runner.RunWith; diff --git a/test/net/filebot/subtitle/MicroDVDReaderTest.java b/test/net/filebot/subtitle/MicroDVDReaderTest.java index b40f1336..cc4a045e 100644 --- a/test/net/filebot/subtitle/MicroDVDReaderTest.java +++ b/test/net/filebot/subtitle/MicroDVDReaderTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import static org.junit.Assert.*; diff --git a/test/net/filebot/subtitle/SubRipReaderTest.java b/test/net/filebot/subtitle/SubRipReaderTest.java index 04d2fea6..c012170b 100644 --- a/test/net/filebot/subtitle/SubRipReaderTest.java +++ b/test/net/filebot/subtitle/SubRipReaderTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import static org.junit.Assert.*; diff --git a/test/net/filebot/subtitle/SubtitleReaderTestSuite.java b/test/net/filebot/subtitle/SubtitleReaderTestSuite.java index e7fd27d0..8d9340bf 100644 --- a/test/net/filebot/subtitle/SubtitleReaderTestSuite.java +++ b/test/net/filebot/subtitle/SubtitleReaderTestSuite.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.subtitle; +package net.filebot.subtitle; import org.junit.runner.RunWith; diff --git a/test/net/filebot/ui/rename/MatchModelTest.java b/test/net/filebot/ui/rename/MatchModelTest.java index 0ee2b7a8..2a6722fa 100644 --- a/test/net/filebot/ui/rename/MatchModelTest.java +++ b/test/net/filebot/ui/rename/MatchModelTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.ui.rename; +package net.filebot.ui.rename; import static org.junit.Assert.*; @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.sourceforge.filebot.similarity.Match; +import net.filebot.similarity.Match; import org.junit.Test; diff --git a/test/net/filebot/util/ByteBufferOutputStreamTest.java b/test/net/filebot/util/ByteBufferOutputStreamTest.java index 84e616a9..5ea55b53 100644 --- a/test/net/filebot/util/ByteBufferOutputStreamTest.java +++ b/test/net/filebot/util/ByteBufferOutputStreamTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static org.junit.Assert.*; diff --git a/test/net/filebot/util/FileUtilitiesTest.java b/test/net/filebot/util/FileUtilitiesTest.java index c64c673a..72708f1d 100644 --- a/test/net/filebot/util/FileUtilitiesTest.java +++ b/test/net/filebot/util/FileUtilitiesTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static org.junit.Assert.*; diff --git a/test/net/filebot/util/FilterIteratorTest.java b/test/net/filebot/util/FilterIteratorTest.java index cc7b5077..6be4875c 100644 --- a/test/net/filebot/util/FilterIteratorTest.java +++ b/test/net/filebot/util/FilterIteratorTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static org.junit.Assert.*; diff --git a/test/net/filebot/util/PreferencesListTest.java b/test/net/filebot/util/PreferencesListTest.java index 1254b83d..1ed3f976 100644 --- a/test/net/filebot/util/PreferencesListTest.java +++ b/test/net/filebot/util/PreferencesListTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static org.junit.Assert.*; @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; import java.util.prefs.Preferences; -import net.sourceforge.filebot.util.PreferencesMap.SimpleAdapter; +import net.filebot.util.PreferencesMap.SimpleAdapter; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/test/net/filebot/util/PreferencesMapTest.java b/test/net/filebot/util/PreferencesMapTest.java index c0edeaf3..a3524e34 100644 --- a/test/net/filebot/util/PreferencesMapTest.java +++ b/test/net/filebot/util/PreferencesMapTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static org.junit.Assert.*; @@ -11,8 +11,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.prefs.Preferences; -import net.sourceforge.filebot.util.PreferencesMap.SerializableAdapter; -import net.sourceforge.filebot.util.PreferencesMap.SimpleAdapter; +import net.filebot.util.PreferencesMap.SerializableAdapter; +import net.filebot.util.PreferencesMap.SimpleAdapter; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/test/net/filebot/util/TestUtil.java b/test/net/filebot/util/TestUtil.java index 9626648d..b13135e3 100644 --- a/test/net/filebot/util/TestUtil.java +++ b/test/net/filebot/util/TestUtil.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import java.util.ArrayList; diff --git a/test/net/filebot/util/TreeIteratorTest.java b/test/net/filebot/util/TreeIteratorTest.java index a3f824ce..0556c28f 100644 --- a/test/net/filebot/util/TreeIteratorTest.java +++ b/test/net/filebot/util/TreeIteratorTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import static org.junit.Assert.*; diff --git a/test/net/filebot/util/UtilTestSuite.java b/test/net/filebot/util/UtilTestSuite.java index 3ff9171a..4f2c96c6 100644 --- a/test/net/filebot/util/UtilTestSuite.java +++ b/test/net/filebot/util/UtilTestSuite.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.util; +package net.filebot.util; import org.junit.runner.RunWith; diff --git a/test/net/filebot/web/AnidbClientTest.java b/test/net/filebot/web/AnidbClientTest.java index a3eed2ba..274b58c3 100644 --- a/test/net/filebot/web/AnidbClientTest.java +++ b/test/net/filebot/web/AnidbClientTest.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static org.junit.Assert.*; diff --git a/test/net/filebot/web/IMDbClientTest.java b/test/net/filebot/web/IMDbClientTest.java index 07f68be9..8e0f1353 100644 --- a/test/net/filebot/web/IMDbClientTest.java +++ b/test/net/filebot/web/IMDbClientTest.java @@ -1,11 +1,11 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static org.junit.Assert.*; import java.util.List; import java.util.Locale; -import net.sourceforge.filebot.web.TMDbClient.MovieInfo; +import net.filebot.web.TMDbClient.MovieInfo; import org.junit.Test; diff --git a/test/net/filebot/web/OpenSubtitlesHasherTest.java b/test/net/filebot/web/OpenSubtitlesHasherTest.java index 242c440d..651fd219 100644 --- a/test/net/filebot/web/OpenSubtitlesHasherTest.java +++ b/test/net/filebot/web/OpenSubtitlesHasherTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static org.junit.Assert.*; diff --git a/test/net/filebot/web/OpenSubtitlesXmlRpcTest.java b/test/net/filebot/web/OpenSubtitlesXmlRpcTest.java index 205ded86..2d337274 100644 --- a/test/net/filebot/web/OpenSubtitlesXmlRpcTest.java +++ b/test/net/filebot/web/OpenSubtitlesXmlRpcTest.java @@ -1,17 +1,17 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static java.util.Collections.*; -import static net.sourceforge.filebot.Settings.*; +import static net.filebot.Settings.*; import static org.junit.Assert.*; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; -import net.sourceforge.filebot.web.OpenSubtitlesSubtitleDescriptor.Property; -import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.Query; -import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.SubFile; -import net.sourceforge.filebot.web.OpenSubtitlesXmlRpc.TryUploadResponse; +import net.filebot.web.OpenSubtitlesSubtitleDescriptor.Property; +import net.filebot.web.OpenSubtitlesXmlRpc.Query; +import net.filebot.web.OpenSubtitlesXmlRpc.SubFile; +import net.filebot.web.OpenSubtitlesXmlRpc.TryUploadResponse; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/test/net/filebot/web/SerienjunkiesClientTest.java b/test/net/filebot/web/SerienjunkiesClientTest.java index 6b2c3187..7c748770 100644 --- a/test/net/filebot/web/SerienjunkiesClientTest.java +++ b/test/net/filebot/web/SerienjunkiesClientTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static org.junit.Assert.*; diff --git a/test/net/filebot/web/TMDbClientTest.java b/test/net/filebot/web/TMDbClientTest.java index 4802ed5f..489045e7 100644 --- a/test/net/filebot/web/TMDbClientTest.java +++ b/test/net/filebot/web/TMDbClientTest.java @@ -1,14 +1,14 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; -import static net.sourceforge.filebot.Settings.*; +import static net.filebot.Settings.*; import static org.junit.Assert.*; import java.util.Arrays; import java.util.List; import java.util.Locale; -import net.sourceforge.filebot.web.TMDbClient.Artwork; -import net.sourceforge.filebot.web.TMDbClient.MovieInfo; +import net.filebot.web.TMDbClient.Artwork; +import net.filebot.web.TMDbClient.MovieInfo; import org.junit.Test; diff --git a/test/net/filebot/web/TVRageClientTest.java b/test/net/filebot/web/TVRageClientTest.java index 1ff14b2d..9a098ca0 100644 --- a/test/net/filebot/web/TVRageClientTest.java +++ b/test/net/filebot/web/TVRageClientTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static org.junit.Assert.*; diff --git a/test/net/filebot/web/TheTVDBClientTest.java b/test/net/filebot/web/TheTVDBClientTest.java index c84d2915..01033aed 100644 --- a/test/net/filebot/web/TheTVDBClientTest.java +++ b/test/net/filebot/web/TheTVDBClientTest.java @@ -1,5 +1,5 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import static org.junit.Assert.*; @@ -11,9 +11,9 @@ import java.util.Locale; import java.util.Map; import net.sf.ehcache.CacheManager; -import net.sourceforge.filebot.web.TheTVDBClient.BannerDescriptor; -import net.sourceforge.filebot.web.TheTVDBClient.MirrorType; -import net.sourceforge.filebot.web.TheTVDBClient.SeriesInfo; +import net.filebot.web.TheTVDBClient.BannerDescriptor; +import net.filebot.web.TheTVDBClient.MirrorType; +import net.filebot.web.TheTVDBClient.SeriesInfo; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/test/net/filebot/web/WebTestSuite.java b/test/net/filebot/web/WebTestSuite.java index 3acb54e4..3f5ea5e7 100644 --- a/test/net/filebot/web/WebTestSuite.java +++ b/test/net/filebot/web/WebTestSuite.java @@ -1,4 +1,4 @@ -package net.sourceforge.filebot.web; +package net.filebot.web; import org.junit.runner.RunWith; import org.junit.runners.Suite;