From 346189a459b23368fe74a91976f00e576ff0a320 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 24 Feb 2016 05:49:54 +0000 Subject: [PATCH] Clean up --- source/net/filebot/cli/CmdlineOperations.java | 1 - source/net/filebot/format/MediaBindingBean.java | 4 +++- source/net/filebot/ui/list/ListPanel.java | 1 - source/net/filebot/ui/subtitle/upload/MovieEditor.java | 1 - source/net/filebot/util/FastFile.java | 2 -- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/source/net/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java index 35659026..1df2d458 100644 --- a/source/net/filebot/cli/CmdlineOperations.java +++ b/source/net/filebot/cli/CmdlineOperations.java @@ -56,7 +56,6 @@ import net.filebot.media.XattrMetaInfoProvider; import net.filebot.similarity.CommonSequenceMatcher; import net.filebot.similarity.EpisodeMatcher; import net.filebot.similarity.Match; -import net.filebot.similarity.SeriesNameMatcher; import net.filebot.subtitle.SubtitleFormat; import net.filebot.subtitle.SubtitleNaming; import net.filebot.util.EntryList; diff --git a/source/net/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java index 5312de28..23b66501 100644 --- a/source/net/filebot/format/MediaBindingBean.java +++ b/source/net/filebot/format/MediaBindingBean.java @@ -99,8 +99,10 @@ public class MediaBindingBean { return getEpisode().getSeriesName(); else if (infoObject instanceof Movie) return getMovie().getName(); + else if (infoObject instanceof AudioTrack && getAlbumArtist() != null) + return getAlbumArtist(); else if (infoObject instanceof AudioTrack) - return getAlbumArtist() != null ? getAlbumArtist() : getArtist(); + return getArtist(); else if (infoObject instanceof File) return FileUtilities.getName((File) infoObject); diff --git a/source/net/filebot/ui/list/ListPanel.java b/source/net/filebot/ui/list/ListPanel.java index aff1b228..b5e48ef7 100644 --- a/source/net/filebot/ui/list/ListPanel.java +++ b/source/net/filebot/ui/list/ListPanel.java @@ -31,7 +31,6 @@ import javax.swing.SpinnerNumberModel; import net.filebot.ResourceManager; 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; diff --git a/source/net/filebot/ui/subtitle/upload/MovieEditor.java b/source/net/filebot/ui/subtitle/upload/MovieEditor.java index af77581b..dfb6d11e 100644 --- a/source/net/filebot/ui/subtitle/upload/MovieEditor.java +++ b/source/net/filebot/ui/subtitle/upload/MovieEditor.java @@ -16,7 +16,6 @@ import javax.swing.JTable; import javax.swing.event.CellEditorListener; import javax.swing.table.TableCellEditor; -import net.filebot.similarity.SeriesNameMatcher; import net.filebot.ui.SelectDialog; import net.filebot.util.FileUtilities; import net.filebot.web.Movie; diff --git a/source/net/filebot/util/FastFile.java b/source/net/filebot/util/FastFile.java index 604b0a20..576739ed 100644 --- a/source/net/filebot/util/FastFile.java +++ b/source/net/filebot/util/FastFile.java @@ -2,9 +2,7 @@ package net.filebot.util; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; public class FastFile extends File {