From 5472ea88bd33ba05340ff48fffdcbbd20ab4a112 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 22 Mar 2016 08:29:42 +0000 Subject: [PATCH] Refactor: rename analyze package to filter --- source/net/filebot/ui/PanelBuilder.java | 4 ++-- .../net/filebot/ui/{analyze => filter}/AttributeTool.java | 2 +- .../net/filebot/ui/{analyze => filter}/ExtractTool.java | 2 +- source/net/filebot/ui/{analyze => filter}/FileTree.java | 2 +- .../ui/{analyze => filter}/FileTreeCellRenderer.java | 2 +- .../ui/{analyze => filter}/FileTreeExportHandler.java | 6 +++--- .../net/filebot/ui/{analyze => filter}/FileTreePanel.java | 2 +- .../{analyze => filter}/FileTreeTransferablePolicy.java | 6 +++--- .../AnalyzePanel.java => filter/FilterPanel.java} | 6 +++--- .../FilterPanelBuilder.java} | 8 ++++---- .../net/filebot/ui/{analyze => filter}/MediaInfoTool.java | 2 +- source/net/filebot/ui/{analyze => filter}/SplitTool.java | 4 ++-- source/net/filebot/ui/{analyze => filter}/Tool.java | 6 +++--- source/net/filebot/ui/{analyze => filter}/TypeTool.java | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) rename source/net/filebot/ui/{analyze => filter}/AttributeTool.java (99%) rename source/net/filebot/ui/{analyze => filter}/ExtractTool.java (99%) rename source/net/filebot/ui/{analyze => filter}/FileTree.java (99%) rename source/net/filebot/ui/{analyze => filter}/FileTreeCellRenderer.java (97%) rename source/net/filebot/ui/{analyze => filter}/FileTreeExportHandler.java (90%) rename source/net/filebot/ui/{analyze => filter}/FileTreePanel.java (98%) rename source/net/filebot/ui/{analyze => filter}/FileTreeTransferablePolicy.java (95%) rename source/net/filebot/ui/{analyze/AnalyzePanel.java => filter/FilterPanel.java} (92%) rename source/net/filebot/ui/{analyze/AnalyzePanelBuilder.java => filter/FilterPanelBuilder.java} (76%) rename source/net/filebot/ui/{analyze => filter}/MediaInfoTool.java (99%) rename source/net/filebot/ui/{analyze => filter}/SplitTool.java (97%) rename source/net/filebot/ui/{analyze => filter}/Tool.java (95%) rename source/net/filebot/ui/{analyze => filter}/TypeTool.java (97%) diff --git a/source/net/filebot/ui/PanelBuilder.java b/source/net/filebot/ui/PanelBuilder.java index 2d6b2f80..872ad2d8 100644 --- a/source/net/filebot/ui/PanelBuilder.java +++ b/source/net/filebot/ui/PanelBuilder.java @@ -4,8 +4,8 @@ package net.filebot.ui; import javax.swing.Icon; import javax.swing.JComponent; -import net.filebot.ui.analyze.AnalyzePanelBuilder; import net.filebot.ui.episodelist.EpisodeListPanelBuilder; +import net.filebot.ui.filter.FilterPanelBuilder; import net.filebot.ui.list.ListPanelBuilder; import net.filebot.ui.rename.RenamePanelBuilder; import net.filebot.ui.sfv.SfvPanelBuilder; @@ -20,7 +20,7 @@ public interface PanelBuilder { public JComponent create(); public static PanelBuilder[] defaultSequence() { - return new PanelBuilder[] { new RenamePanelBuilder(), new EpisodeListPanelBuilder(), new SubtitlePanelBuilder(), new SfvPanelBuilder(), new AnalyzePanelBuilder(), new ListPanelBuilder() }; + return new PanelBuilder[] { new RenamePanelBuilder(), new EpisodeListPanelBuilder(), new SubtitlePanelBuilder(), new SfvPanelBuilder(), new FilterPanelBuilder(), new ListPanelBuilder() }; } public static PanelBuilder[] episodeHandlerSequence() { diff --git a/source/net/filebot/ui/analyze/AttributeTool.java b/source/net/filebot/ui/filter/AttributeTool.java similarity index 99% rename from source/net/filebot/ui/analyze/AttributeTool.java rename to source/net/filebot/ui/filter/AttributeTool.java index 01f0677e..3b2148a8 100644 --- a/source/net/filebot/ui/analyze/AttributeTool.java +++ b/source/net/filebot/ui/filter/AttributeTool.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static net.filebot.Logging.*; import static net.filebot.MediaTypes.*; diff --git a/source/net/filebot/ui/analyze/ExtractTool.java b/source/net/filebot/ui/filter/ExtractTool.java similarity index 99% rename from source/net/filebot/ui/analyze/ExtractTool.java rename to source/net/filebot/ui/filter/ExtractTool.java index 28c5a63f..3d79beeb 100644 --- a/source/net/filebot/ui/analyze/ExtractTool.java +++ b/source/net/filebot/ui/filter/ExtractTool.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static net.filebot.Logging.*; import static net.filebot.UserFiles.*; diff --git a/source/net/filebot/ui/analyze/FileTree.java b/source/net/filebot/ui/filter/FileTree.java similarity index 99% rename from source/net/filebot/ui/analyze/FileTree.java rename to source/net/filebot/ui/filter/FileTree.java index 48b16910..dd375143 100644 --- a/source/net/filebot/ui/analyze/FileTree.java +++ b/source/net/filebot/ui/filter/FileTree.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static java.util.Collections.*; import static java.util.stream.Collectors.*; diff --git a/source/net/filebot/ui/analyze/FileTreeCellRenderer.java b/source/net/filebot/ui/filter/FileTreeCellRenderer.java similarity index 97% rename from source/net/filebot/ui/analyze/FileTreeCellRenderer.java rename to source/net/filebot/ui/filter/FileTreeCellRenderer.java index acb5e270..fed639fe 100644 --- a/source/net/filebot/ui/analyze/FileTreeCellRenderer.java +++ b/source/net/filebot/ui/filter/FileTreeCellRenderer.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import java.awt.Component; diff --git a/source/net/filebot/ui/analyze/FileTreeExportHandler.java b/source/net/filebot/ui/filter/FileTreeExportHandler.java similarity index 90% rename from source/net/filebot/ui/analyze/FileTreeExportHandler.java rename to source/net/filebot/ui/filter/FileTreeExportHandler.java index 7f826d67..5cbfedc1 100644 --- a/source/net/filebot/ui/analyze/FileTreeExportHandler.java +++ b/source/net/filebot/ui/filter/FileTreeExportHandler.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import java.awt.datatransfer.Transferable; import java.io.File; @@ -10,8 +10,8 @@ import javax.swing.TransferHandler; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import net.filebot.ui.analyze.FileTree.FileNode; -import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.filter.FileTree.FileNode; +import net.filebot.ui.filter.FileTree.FolderNode; import net.filebot.ui.transfer.FileTransferable; import net.filebot.ui.transfer.TransferableExportHandler; diff --git a/source/net/filebot/ui/analyze/FileTreePanel.java b/source/net/filebot/ui/filter/FileTreePanel.java similarity index 98% rename from source/net/filebot/ui/analyze/FileTreePanel.java rename to source/net/filebot/ui/filter/FileTreePanel.java index 39b1804f..757eec37 100644 --- a/source/net/filebot/ui/analyze/FileTreePanel.java +++ b/source/net/filebot/ui/filter/FileTreePanel.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static net.filebot.ui.transfer.BackgroundFileTransferablePolicy.*; import static net.filebot.util.ui.SwingUI.*; diff --git a/source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java b/source/net/filebot/ui/filter/FileTreeTransferablePolicy.java similarity index 95% rename from source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java rename to source/net/filebot/ui/filter/FileTreeTransferablePolicy.java index 303a6353..4e35c5cb 100644 --- a/source/net/filebot/ui/analyze/FileTreeTransferablePolicy.java +++ b/source/net/filebot/ui/filter/FileTreeTransferablePolicy.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static net.filebot.Logging.*; import static net.filebot.Settings.*; @@ -15,8 +15,8 @@ import java.util.logging.Level; import javax.swing.tree.TreeNode; import net.filebot.mac.MacAppUtilities; -import net.filebot.ui.analyze.FileTree.FileNode; -import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.filter.FileTree.FileNode; +import net.filebot.ui.filter.FileTree.FolderNode; import net.filebot.ui.transfer.BackgroundFileTransferablePolicy; import net.filebot.util.ExceptionUtilities; import net.filebot.util.FastFile; diff --git a/source/net/filebot/ui/analyze/AnalyzePanel.java b/source/net/filebot/ui/filter/FilterPanel.java similarity index 92% rename from source/net/filebot/ui/analyze/AnalyzePanel.java rename to source/net/filebot/ui/filter/FilterPanel.java index a902bb20..40d0926e 100644 --- a/source/net/filebot/ui/analyze/AnalyzePanel.java +++ b/source/net/filebot/ui/filter/FilterPanel.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import java.awt.datatransfer.Transferable; @@ -11,12 +11,12 @@ import net.filebot.ui.transfer.TransferablePolicy; import net.filebot.ui.transfer.TransferablePolicy.TransferAction; import net.miginfocom.swing.MigLayout; -public class AnalyzePanel extends JComponent { +public class FilterPanel extends JComponent { private final FileTreePanel fileTreePanel = new FileTreePanel(); private final JTabbedPane toolsPanel = new JTabbedPane(); - public AnalyzePanel() { + public FilterPanel() { setLayout(new MigLayout("insets dialog, gapx 50, fill, nogrid")); add(fileTreePanel, "grow 1, w 300:pref:500"); add(toolsPanel, "grow 2"); diff --git a/source/net/filebot/ui/analyze/AnalyzePanelBuilder.java b/source/net/filebot/ui/filter/FilterPanelBuilder.java similarity index 76% rename from source/net/filebot/ui/analyze/AnalyzePanelBuilder.java rename to source/net/filebot/ui/filter/FilterPanelBuilder.java index 9f333180..3a3486b0 100644 --- a/source/net/filebot/ui/analyze/AnalyzePanelBuilder.java +++ b/source/net/filebot/ui/filter/FilterPanelBuilder.java @@ -1,5 +1,5 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import javax.swing.Icon; import javax.swing.JComponent; @@ -7,7 +7,7 @@ import javax.swing.JComponent; import net.filebot.ResourceManager; import net.filebot.ui.PanelBuilder; -public class AnalyzePanelBuilder implements PanelBuilder { +public class FilterPanelBuilder implements PanelBuilder { @Override public String getName() { @@ -21,12 +21,12 @@ public class AnalyzePanelBuilder implements PanelBuilder { @Override public boolean equals(Object obj) { - return obj instanceof AnalyzePanelBuilder; + return obj instanceof FilterPanelBuilder; } @Override public JComponent create() { - AnalyzePanel panel = new AnalyzePanel(); + FilterPanel panel = new FilterPanel(); panel.addTool(new ExtractTool()); panel.addTool(new TypeTool()); panel.addTool(new SplitTool()); diff --git a/source/net/filebot/ui/analyze/MediaInfoTool.java b/source/net/filebot/ui/filter/MediaInfoTool.java similarity index 99% rename from source/net/filebot/ui/analyze/MediaInfoTool.java rename to source/net/filebot/ui/filter/MediaInfoTool.java index 80aac4c2..0a60c865 100644 --- a/source/net/filebot/ui/analyze/MediaInfoTool.java +++ b/source/net/filebot/ui/filter/MediaInfoTool.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static java.util.Collections.*; import static net.filebot.Logging.*; diff --git a/source/net/filebot/ui/analyze/SplitTool.java b/source/net/filebot/ui/filter/SplitTool.java similarity index 97% rename from source/net/filebot/ui/analyze/SplitTool.java rename to source/net/filebot/ui/filter/SplitTool.java index e92d0551..dce61068 100644 --- a/source/net/filebot/ui/analyze/SplitTool.java +++ b/source/net/filebot/ui/filter/SplitTool.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import java.awt.Color; import java.io.File; @@ -15,7 +15,7 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import javax.swing.tree.TreeNode; -import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.filter.FileTree.FolderNode; import net.filebot.ui.transfer.DefaultTransferHandler; import net.filebot.util.FileUtilities; import net.filebot.util.ui.GradientStyle; diff --git a/source/net/filebot/ui/analyze/Tool.java b/source/net/filebot/ui/filter/Tool.java similarity index 95% rename from source/net/filebot/ui/analyze/Tool.java rename to source/net/filebot/ui/filter/Tool.java index ca3be071..29504676 100644 --- a/source/net/filebot/ui/analyze/Tool.java +++ b/source/net/filebot/ui/filter/Tool.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static net.filebot.Logging.*; @@ -15,8 +15,8 @@ import javax.swing.tree.TreeNode; import org.apache.commons.io.FileUtils; -import net.filebot.ui.analyze.FileTree.FileNode; -import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.filter.FileTree.FileNode; +import net.filebot.ui.filter.FileTree.FolderNode; import net.filebot.util.ExceptionUtilities; import net.filebot.util.FileUtilities; import net.filebot.util.ui.LoadingOverlayPane; diff --git a/source/net/filebot/ui/analyze/TypeTool.java b/source/net/filebot/ui/filter/TypeTool.java similarity index 97% rename from source/net/filebot/ui/analyze/TypeTool.java rename to source/net/filebot/ui/filter/TypeTool.java index 166f45e7..134a198d 100644 --- a/source/net/filebot/ui/analyze/TypeTool.java +++ b/source/net/filebot/ui/filter/TypeTool.java @@ -1,4 +1,4 @@ -package net.filebot.ui.analyze; +package net.filebot.ui.filter; import static java.util.Arrays.*; import static java.util.Collections.*; @@ -23,7 +23,7 @@ import javax.swing.tree.TreeNode; import net.filebot.MediaTypes; import net.filebot.media.MediaDetection; -import net.filebot.ui.analyze.FileTree.FolderNode; +import net.filebot.ui.filter.FileTree.FolderNode; import net.filebot.ui.transfer.DefaultTransferHandler; import net.filebot.util.ui.LoadingOverlayPane; import net.miginfocom.swing.MigLayout;