From 6bb62aafb3cf7f5b3df4646b1f67497526562701 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 4 Feb 2023 23:14:30 +0100 Subject: [PATCH] #186 - convert CartActionHandler scala classes to java --- .../cart/handler/CartActionHandler.java | 10 +++++++ .../cart/handler/CartActionHandler.scala | 10 ------- .../handler/CartActionHandlerFactory.java | 27 +++++++++++++++++++ .../handler/CartActionHandlerFactory.scala | 15 ----------- .../actions/cart/handler/PlayHoldHandler.java | 27 +++++++++++++++++++ .../cart/handler/PlayHoldHandler.scala | 20 -------------- .../cart/handler/PlayPauseHandler.java | 25 +++++++++++++++++ .../cart/handler/PlayPauseHandler.scala | 20 -------------- .../actions/cart/handler/PlayPlayHandler.java | 19 +++++++++++++ .../cart/handler/PlayPlayHandler.scala | 14 ---------- .../actions/cart/handler/PlayStopHandler.java | 25 +++++++++++++++++ .../cart/handler/PlayStopHandler.scala | 19 ------------- 12 files changed, 133 insertions(+), 98 deletions(-) create mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java delete mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.scala create mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.java delete mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala create mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.java delete mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala create mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.java delete mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala create mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.java delete mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala create mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.java delete mode 100644 PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java new file mode 100644 index 00000000..943d6e8e --- /dev/null +++ b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java @@ -0,0 +1,10 @@ +package de.tobias.playpad.action.actions.cart.handler; + +import de.thecodelabs.midi.event.KeyEventType; +import de.tobias.playpad.action.actions.CartAction; +import de.tobias.playpad.pad.Pad; + +public interface CartActionHandler +{ + void performAction(KeyEventType keyEventType, CartAction cartAction, Pad pad); +} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.scala b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.scala deleted file mode 100644 index 68e7102c..00000000 --- a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.scala +++ /dev/null @@ -1,10 +0,0 @@ -package de.tobias.playpad.action.actions.cart.handler - -import de.thecodelabs.midi.event.KeyEventType -import de.tobias.playpad.action.actions.CartAction -import de.tobias.playpad.pad.Pad - -trait CartActionHandler { - - def performAction(keyEventType: KeyEventType, cartAction: CartAction, pad: Pad): Unit -} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.java b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.java new file mode 100644 index 00000000..39e45b2d --- /dev/null +++ b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.java @@ -0,0 +1,27 @@ +package de.tobias.playpad.action.actions.cart.handler; + +import de.tobias.playpad.action.actions.CartAction; + +public class CartActionHandlerFactory +{ + private CartActionHandlerFactory() + { + } + + public static CartActionHandler getInstance(CartAction.CartActionMode cartActionMode) + { + switch(cartActionMode) + { + case PLAY_PAUSE: + return new PlayPauseHandler(); + case PLAY_STOP: + return new PlayStopHandler(); + case PLAY_HOLD: + return new PlayHoldHandler(); + case PLAY_PLAY: + return new PlayPlayHandler(); + default: + return null; + } + } +} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala deleted file mode 100644 index 05a7a32b..00000000 --- a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala +++ /dev/null @@ -1,15 +0,0 @@ -package de.tobias.playpad.action.actions.cart.handler - -import de.tobias.playpad.action.actions.CartAction.CartActionMode - -object CartActionHandlerFactory { - - def getInstance(cartActionMode: CartActionMode): CartActionHandler = { - cartActionMode match { - case CartActionMode.PLAY_STOP => new PlayStopHandler() - case CartActionMode.PLAY_PAUSE => new PlayPauseHandler() - case CartActionMode.PLAY_HOLD => new PlayHoldHandler() - case CartActionMode.PLAY_PLAY => new PlayPlayHandler() - } - } -} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.java b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.java new file mode 100644 index 00000000..164e7977 --- /dev/null +++ b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.java @@ -0,0 +1,27 @@ +package de.tobias.playpad.action.actions.cart.handler; + +import de.thecodelabs.midi.event.KeyEventType; +import de.tobias.playpad.action.actions.CartAction; +import de.tobias.playpad.pad.Pad; + +public class PlayHoldHandler implements CartActionHandler +{ + @Override + public void performAction(KeyEventType keyEventType, CartAction cartAction, Pad pad) + { + if(keyEventType.equals(KeyEventType.DOWN)) + { + if(pad.isReady()) + { + pad.play(); + } + } + else if(keyEventType.equals(KeyEventType.UP)) + { + if(pad.isPlay()) + { + pad.stop(); + } + } + } +} \ No newline at end of file diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala deleted file mode 100644 index 1aa63b52..00000000 --- a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala +++ /dev/null @@ -1,20 +0,0 @@ -package de.tobias.playpad.action.actions.cart.handler - -import de.thecodelabs.midi.event.KeyEventType -import de.tobias.playpad.action.actions.CartAction -import de.tobias.playpad.pad.Pad - -class PlayHoldHandler extends CartActionHandler { - - override def performAction(keyEventType: KeyEventType, cartAction: CartAction, pad: Pad): Unit = { - if (keyEventType eq KeyEventType.DOWN) { - if (pad.isReady) { - pad.play() - } - } else if (keyEventType eq KeyEventType.UP) { - if (pad.isPlay) { - pad.stop() - } - } - } -} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.java b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.java new file mode 100644 index 00000000..859ececd --- /dev/null +++ b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.java @@ -0,0 +1,25 @@ +package de.tobias.playpad.action.actions.cart.handler; + +import de.thecodelabs.midi.event.KeyEventType; +import de.tobias.playpad.action.actions.CartAction; +import de.tobias.playpad.pad.Pad; + +public class PlayPauseHandler implements CartActionHandler +{ + @Override + public void performAction(KeyEventType keyEventType, CartAction cartAction, Pad pad) + { + if(keyEventType.equals(KeyEventType.DOWN)) + { + if(pad.isPlay()) + { + pad.pause(); + } + else + { // Allow the listener to send the feedback + // cartAction.getPadPositionListener.setSend(false) TODO Fix + pad.play(); + } + } + } +} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala deleted file mode 100644 index 87c26d4e..00000000 --- a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala +++ /dev/null @@ -1,20 +0,0 @@ -package de.tobias.playpad.action.actions.cart.handler - -import de.thecodelabs.midi.event.KeyEventType -import de.tobias.playpad.action.actions.CartAction -import de.tobias.playpad.pad.Pad - -class PlayPauseHandler extends CartActionHandler { - - override def performAction(keyEventType: KeyEventType, cartAction: CartAction, pad: Pad): Unit = { - if (keyEventType eq KeyEventType.DOWN) { - if (pad.isPlay) { - pad.pause() - } - else { // Allow the listener to send the feedback - // cartAction.getPadPositionListener.setSend(false) TODO Fix - pad.play() - } - } - } -} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.java b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.java new file mode 100644 index 00000000..87b71698 --- /dev/null +++ b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.java @@ -0,0 +1,19 @@ +package de.tobias.playpad.action.actions.cart.handler; + +import de.thecodelabs.midi.event.KeyEventType; +import de.tobias.playpad.action.actions.CartAction; +import de.tobias.playpad.pad.Pad; +import de.tobias.playpad.pad.PadStatus; + +public class PlayPlayHandler implements CartActionHandler +{ + + @Override + public void performAction(KeyEventType keyEventType, CartAction cartAction, Pad pad) + { + if(keyEventType.equals(KeyEventType.DOWN)) + { + pad.setStatus(PadStatus.RESTART); + } + } +} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala deleted file mode 100644 index fec8eebc..00000000 --- a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala +++ /dev/null @@ -1,14 +0,0 @@ -package de.tobias.playpad.action.actions.cart.handler - -import de.thecodelabs.midi.event.KeyEventType -import de.tobias.playpad.action.actions.CartAction -import de.tobias.playpad.pad.{Pad, PadStatus} - -class PlayPlayHandler extends CartActionHandler { - - override def performAction(keyEventType: KeyEventType, cartAction: CartAction, pad: Pad): Unit = { - if (keyEventType eq KeyEventType.DOWN) { - pad.setStatus(PadStatus.RESTART) - } - } -} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.java b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.java new file mode 100644 index 00000000..091f28a5 --- /dev/null +++ b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.java @@ -0,0 +1,25 @@ +package de.tobias.playpad.action.actions.cart.handler; + +import de.thecodelabs.midi.event.KeyEventType; +import de.tobias.playpad.action.actions.CartAction; +import de.tobias.playpad.pad.Pad; + +public class PlayStopHandler implements CartActionHandler +{ + @Override + public void performAction(KeyEventType keyEventType, CartAction cartAction, Pad pad) + { + if(keyEventType.equals(KeyEventType.DOWN)) + { + if(pad.isPlay()) + { + pad.stop(); + } + else + { // Allow the listener to send the feedback + // cartAction.getPadPositionListener.setSend(false) TODO Fix + pad.play(); + } + } + } +} diff --git a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala b/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala deleted file mode 100644 index 11957fa9..00000000 --- a/PlayWall/src/main/scala/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala +++ /dev/null @@ -1,19 +0,0 @@ -package de.tobias.playpad.action.actions.cart.handler - -import de.thecodelabs.midi.event.KeyEventType -import de.tobias.playpad.action.actions.CartAction -import de.tobias.playpad.pad.Pad - -class PlayStopHandler extends CartActionHandler { - - override def performAction(keyEventType: KeyEventType, cartAction: CartAction, pad: Pad): Unit = { - if (keyEventType eq KeyEventType.DOWN) { - if (pad.isPlay) { - pad.stop() - } else { // Allow the listener to send the feedback - // cartAction.getPadPositionListener.setSend(false) TODO Fix - pad.play() - } - } - } -} -- GitLab