ButtonToModeAction: removed non-parameterless constructor

bwRavencl · Aug 16, 2023 · 42d0f1b · 42d0f1b
1 parent fba4fc9
commit 42d0f1b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/de/bwravencl/controllerbuddy/gui/EditActionsDialog.java b/src/main/java/de/bwravencl/controllerbuddy/gui/EditActionsDialog.java
@@ -364,9 +364,15 @@ private IAction<?> getActionClassInstance(final Class<?> actionClass)
 			throw new IllegalArgumentException(
 					"Class '" + actionClass.getName() + "' does not implement '" + IAction.class.getSimpleName() + "'");
 
-		if (actionClass == ButtonToModeAction.class)
-			return new ButtonToModeAction(input);
-		return (IAction<?>) actionClass.getConstructor().newInstance();
+		final var action = (IAction<?>) actionClass.getConstructor().newInstance();
+
+		if (action instanceof final ButtonToModeAction buttonToModeAction) {
+			final var modes = input.getProfile().getModes();
+			final var defaultMode = modes.size() > 1 ? modes.get(1) : OnScreenKeyboard.onScreenKeyboardMode;
+			buttonToModeAction.setMode(defaultMode);
+		}
+
+		return action;
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/src/main/java/de/bwravencl/controllerbuddy/input/action/ButtonToModeAction.java b/src/main/java/de/bwravencl/controllerbuddy/input/action/ButtonToModeAction.java
@@ -54,11 +54,6 @@ public static LinkedList<ButtonToModeAction> getButtonToModeActionStack() {
 
 	private transient boolean up = true;
 
-	public ButtonToModeAction(final Input input) {
-		final var modes = input.getProfile().getModes();
-		setMode(modes.size() > 1 ? modes.get(1) : OnScreenKeyboard.onScreenKeyboardMode);
-	}
-
 	private void activateMode(final Input input, final Profile profile) {
 		if (!buttonToModeActionStack.contains(this)) {
 			buttonToModeActionStack.push(this);