From b2685c0427cdade1c9dc998a867ce943c6bf45f3 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 26 Jul 2015 21:43:16 +0000 Subject: [PATCH] * refactor --- source/net/filebot/ui/rename/RenamePanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java index 932e66bc..e22ab6a3 100644 --- a/source/net/filebot/ui/rename/RenamePanel.java +++ b/source/net/filebot/ui/rename/RenamePanel.java @@ -406,17 +406,17 @@ public class RenamePanel extends JComponent { List presetNames = new ArrayList(persistentPresets.keySet()); presetNames.add(newPresetOption); - String selection = (String) JOptionPane.showInputDialog(getWindow(evt.getSource()), "Edit or create a preset:", "Edit Preset", JOptionPane.PLAIN_MESSAGE, null, presetNames.toArray(), newPresetOption); + String selection = (String) showInputDialog(getWindow(evt.getSource()), "Edit or create a preset:", "Edit Preset", PLAIN_MESSAGE, null, presetNames.toArray(), newPresetOption); if (selection == null) return; Preset preset = null; if (selection == newPresetOption) { - selection = (String) JOptionPane.showInputDialog(getWindow(evt.getSource()), "Preset Name:", newPresetOption, JOptionPane.PLAIN_MESSAGE, null, null, "My Preset"); - if (selection == null) + selection = (String) showInputDialog(getWindow(evt.getSource()), "Preset Name:", newPresetOption, PLAIN_MESSAGE, null, null, "My Preset"); + if (selection == null || selection.trim().isEmpty()) return; - preset = new Preset(selection, null, null, null, null, null, null, null, null); + preset = new Preset(selection.trim(), null, null, null, null, null, null, null, null); } else { preset = (Preset) JsonReader.jsonToJava(persistentPresets.get(selection.toString())); }