From 96922cc8aaef4c147fcc656008ec06588a12be91 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Thu, 25 May 2017 11:44:36 +0800
Subject: [PATCH] Refactor PresetEditor

---
 source/net/filebot/ui/rename/PresetEditor.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/net/filebot/ui/rename/PresetEditor.java b/source/net/filebot/ui/rename/PresetEditor.java
index a347a6b4..dd6da891 100644
--- a/source/net/filebot/ui/rename/PresetEditor.java
+++ b/source/net/filebot/ui/rename/PresetEditor.java
@@ -42,6 +42,7 @@ import net.filebot.format.ExpressionFilter;
 import net.filebot.format.MediaBindingBean;
 import net.filebot.platform.mac.MacAppUtilities;
 import net.filebot.ui.HeaderPanel;
+import net.filebot.ui.rename.FormatDialog.Mode;
 import net.filebot.util.FileUtilities.ExtensionFileFilter;
 import net.filebot.web.Datasource;
 import net.filebot.web.EpisodeListProvider;
@@ -61,11 +62,12 @@ public class PresetEditor extends JDialog {
 	private JTextField pathInput;
 	private RSyntaxTextArea filterEditor;
 	private RSyntaxTextArea formatEditor;
-	private JComboBox<RenameAction> actionCombo;
+
 	private JComboBox<Datasource> providerCombo;
 	private JComboBox<SortOrder> sortOrderCombo;
-	private JComboBox<String> matchModeCombo;
 	private JComboBox<Language> languageCombo;
+	private JComboBox<String> matchModeCombo;
+	private JComboBox<RenameAction> actionCombo;
 
 	private JRadioButton selectRadio;
 	private JRadioButton inheritRadio;
@@ -301,12 +303,12 @@ public class PresetEditor extends JDialog {
 	});
 
 	private final Action editFormatExpression = newAction("Open Format Editor", ResourceManager.getIcon("action.format"), evt -> {
-		FormatDialog.Mode mode = FormatDialog.Mode.getMode((Datasource) providerCombo.getSelectedItem());
+		Mode mode = Mode.getMode((Datasource) providerCombo.getSelectedItem());
 
 		Object sample = mode.getDefaultSampleObject();
 		File file = null;
 
-		if (mode == FormatDialog.Mode.File) {
+		if (mode == Mode.File) {
 			List<File> files = UserFiles.showLoadDialogSelectFiles(false, false, null, new ExtensionFileFilter(ExtensionFileFilter.WILDCARD), "Select Sample File", evt);
 			if (files.isEmpty()) {
 				return;
@@ -345,7 +347,7 @@ public class PresetEditor extends JDialog {
 				if (files.size() > 0) {
 					for (File f : files) {
 						popup.add(newAction(f.getPath(), e -> {
-							BindingDialog dialog = new BindingDialog(getWindow(evt.getSource()), "File Bindings", FormatDialog.Mode.File.getFormat(), false);
+							BindingDialog dialog = new BindingDialog(getWindow(evt.getSource()), "File Bindings", Mode.File.getFormat(), false);
 							dialog.setLocation(getOffsetLocation(getWindow(evt.getSource())));
 							dialog.setSample(new MediaBindingBean(f, f));
 							dialog.setVisible(true);