diff --git a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala index f014e51722543db1dc41172609a6bef2f770e0b7..705ebffffc2196e18a2945f063866125657feded 100644 --- a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala +++ b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala @@ -12,7 +12,7 @@ import org.springframework.expression.common.TemplateParserContext import org.springframework.expression.spel.standard.SpelExpressionParser import org.springframework.expression.spel.support.StandardEvaluationContext -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler { diff --git a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala index 2640d8e9524345dfd32db3131589767f91274da5..c86ba27c29a721faa940faf92f94bc3a674188b4 100644 --- a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala +++ b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala @@ -21,7 +21,7 @@ import org.springframework.expression.common.TemplateParserContext import org.springframework.expression.spel.standard.SpelExpressionParser import org.springframework.expression.spel.support.StandardEvaluationContext -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with ColorModeHandler { diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/midi/Midi.java b/PlayWallCore/src/main/java/de/tobias/playpad/midi/Midi.java index 137e557a2131df2507bf071fa791ed0303c6d33b..bae98fa96d46c6f8dc695ad55983ef806acd0edd 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/midi/Midi.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/midi/Midi.java @@ -1,10 +1,12 @@ package de.tobias.playpad.midi; +import de.thecodelabs.logger.Logger; import de.tobias.playpad.action.mididevice.MidiDeviceImpl; import de.tobias.playpad.midi.device.DeviceRegistry; import javax.sound.midi.*; import javax.sound.midi.MidiDevice.Info; +import java.lang.reflect.InvocationTargetException; public class Midi implements AutoCloseable { @@ -92,8 +94,8 @@ public class Midi implements AutoCloseable { // Hier wird die DeviceImpl aufgerufen try { this.midiMidiDeviceImplImpl = DeviceRegistry.getFactoryInstance().getDevice(input.getName()); - } catch (InstantiationException | IllegalAccessException e) { - e.printStackTrace(); + } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { + Logger.error(e); } setupMidiDevice(); } @@ -143,7 +145,7 @@ public class Midi implements AutoCloseable { try { listener.onMidiAction(msg); } catch (Exception e) { - e.printStackTrace(); + Logger.error(e); } } @@ -157,7 +159,7 @@ public class Midi implements AutoCloseable { return inputDevice != null && outputDevice != null && inputDevice.isOpen() && outputDevice.isOpen(); } - public void sendClearCommand() throws InvalidMidiDataException, MidiUnavailableException { + public void sendClearCommand() { if (midiMidiDeviceImplImpl != null) { midiMidiDeviceImplImpl.clearFeedback(); }