From 0c279d26fcfbc7632aa8cee99af5833471ccc6cb Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sun, 7 Jul 2019 20:42:09 +0200
Subject: [PATCH] Fix compiler warnings and error
---
.../playpad/design/ModernCartDesignHandlerImpl.scala | 2 +-
.../playpad/design/ModernGlobalDesignHandlerImpl.scala | 2 +-
.../src/main/java/de/tobias/playpad/midi/Midi.java | 10 ++++++----
3 files changed, 8 insertions(+), 6 deletions(-)
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 f014e517..705ebfff 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 2640d8e9..c86ba27c 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 137e557a..bae98fa9 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();
}
--
GitLab