From 861a218c9bad31464bf5d1a1030b498271e57d6c Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Mon, 16 Oct 2017 21:17:37 +0200
Subject: [PATCH] Fix @Deprecated warnings related to AWT KeyStroke codes

---
 source/net/filebot/ui/MainFrame.java                    | 2 +-
 source/net/filebot/ui/SelectButtonTextField.java        | 4 ++--
 source/net/filebot/ui/episodelist/EpisodeListPanel.java | 4 ++--
 source/net/filebot/util/ui/SwingUI.java                 | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/net/filebot/ui/MainFrame.java b/source/net/filebot/ui/MainFrame.java
index a21bb6d8..8109b727 100644
--- a/source/net/filebot/ui/MainFrame.java
+++ b/source/net/filebot/ui/MainFrame.java
@@ -96,7 +96,7 @@ public class MainFrame extends JFrame {
 		setMinimumSize(new Dimension(900, 340));
 
 		// KEYBOARD SHORTCUTS
-		installAction(getRootPane(), getKeyStroke(VK_DELETE, CTRL_MASK | SHIFT_MASK), newAction("Clear Cache", evt -> {
+		installAction(getRootPane(), getKeyStroke(VK_DELETE, CTRL_DOWN_MASK | SHIFT_DOWN_MASK), newAction("Clear Cache", evt -> {
 			withWaitCursor(getRootPane(), () -> {
 				CacheManager.getInstance().clearAll();
 				log.info("Cache has been cleared");
diff --git a/source/net/filebot/ui/SelectButtonTextField.java b/source/net/filebot/ui/SelectButtonTextField.java
index e7a5ba47..97e3a06b 100644
--- a/source/net/filebot/ui/SelectButtonTextField.java
+++ b/source/net/filebot/ui/SelectButtonTextField.java
@@ -56,8 +56,8 @@ public class SelectButtonTextField<T> extends JComponent {
 		editor.setUI(new TextFieldComboBoxUI(selectButton));
 		editor.setMaximumRowCount(10);
 
-		SwingUI.installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.CTRL_MASK), new SpinClientAction(-1));
-		SwingUI.installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.CTRL_MASK), new SpinClientAction(1));
+		SwingUI.installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.CTRL_DOWN_MASK), new SpinClientAction(-1));
+		SwingUI.installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.CTRL_DOWN_MASK), new SpinClientAction(1));
 	}
 
 	public String getText() {
diff --git a/source/net/filebot/ui/episodelist/EpisodeListPanel.java b/source/net/filebot/ui/episodelist/EpisodeListPanel.java
index c66f2015..f5185505 100644
--- a/source/net/filebot/ui/episodelist/EpisodeListPanel.java
+++ b/source/net/filebot/ui/episodelist/EpisodeListPanel.java
@@ -72,8 +72,8 @@ public class EpisodeListPanel extends AbstractSearchPanel<EpisodeListProvider, E
 
 		searchTextField.getSelectButton().addPropertyChangeListener(SelectButton.SELECTED_VALUE, selectButtonListener);
 
-		installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.SHIFT_MASK), new SpinSeasonAction(1));
-		installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_MASK), new SpinSeasonAction(-1));
+		installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.SHIFT_DOWN_MASK), new SpinSeasonAction(1));
+		installAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_DOWN_MASK), new SpinSeasonAction(-1));
 	}
 
 	@Override
diff --git a/source/net/filebot/util/ui/SwingUI.java b/source/net/filebot/util/ui/SwingUI.java
index 7e5c4e05..5466bbab 100644
--- a/source/net/filebot/util/ui/SwingUI.java
+++ b/source/net/filebot/util/ui/SwingUI.java
@@ -140,7 +140,7 @@ public final class SwingUI {
 	}
 
 	public static boolean isShiftOrAltDown(InputEvent evt) {
-		return checkModifiers(evt.getModifiers(), ActionEvent.SHIFT_MASK) || checkModifiers(evt.getModifiers(), ActionEvent.ALT_MASK);
+		return checkModifiers(evt.getModifiersEx(), InputEvent.SHIFT_DOWN_MASK) || checkModifiers(evt.getModifiersEx(), InputEvent.ALT_DOWN_MASK);
 	}
 
 	public static boolean isShiftOrAltDown(ActionEvent evt) {
@@ -200,14 +200,14 @@ public final class SwingUI {
 		component.getDocument().addUndoableEditListener(undoSupport);
 
 		// install undo action
-		installAction(component, KeyStroke.getKeyStroke(KeyEvent.VK_Z, KeyEvent.CTRL_MASK), newAction("Undo", evt -> {
+		installAction(component, KeyStroke.getKeyStroke(KeyEvent.VK_Z, KeyEvent.CTRL_DOWN_MASK), newAction("Undo", evt -> {
 			if (undoSupport.canUndo()) {
 				undoSupport.undo();
 			}
 		}));
 
 		// install redo action
-		installAction(component, KeyStroke.getKeyStroke(KeyEvent.VK_Y, KeyEvent.CTRL_MASK), newAction("Redo", evt -> {
+		installAction(component, KeyStroke.getKeyStroke(KeyEvent.VK_Y, KeyEvent.CTRL_DOWN_MASK), newAction("Redo", evt -> {
 			if (undoSupport.canRedo()) {
 				undoSupport.redo();
 			}