From 404397ab6e8b6d7efad2a71d83cd44d824e2e6b0 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 21 Oct 2020 21:52:13 +0200
Subject: [PATCH] Cleanup initialization
---
.idea/encodings.xml | 1 +
.../tobias/playpad/initialize/KeyboardDefaultMappingTask.scala | 3 ---
.../de/tobias/playpad/initialize/ProfileLoadingTask.scala | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index a39835be..573656f6 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -11,6 +11,7 @@
<file url="file://$PROJECT_DIR$/PlayWallComponents/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallCore" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallCore/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallCore/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallPlugins" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake/src/main/java" charset="UTF-8" />
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/KeyboardDefaultMappingTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/KeyboardDefaultMappingTask.scala
index cf64b19a..9bb884fa 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/KeyboardDefaultMappingTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/KeyboardDefaultMappingTask.scala
@@ -1,16 +1,13 @@
package de.tobias.playpad.initialize
import de.thecodelabs.utils.application
-import de.thecodelabs.utils.application.container.PathType
import de.thecodelabs.utils.util.Localization
import de.tobias.playpad.PlayPadImpl
-import de.tobias.playpad.settings.GlobalSettings
class KeyboardDefaultMappingTask extends PlayPadInitializeTask {
override def name(): String = "Keyboard Mapping"
override def run(app: application.App, instance: PlayPadImpl): Unit = {
- val globalSettingsPath = app.getPath(PathType.CONFIGURATION, GlobalSettings.FILE_NAME)
val globalSettings = instance.getGlobalSettings
globalSettings.getKeyCollection.loadDefaultFromFile("components/Keys.xml", Localization.getBundle)
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProfileLoadingTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProfileLoadingTask.scala
index 9f9ff14a..c6f3b28b 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProfileLoadingTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProfileLoadingTask.scala
@@ -14,8 +14,7 @@ class ProfileLoadingTask extends PlayPadInitializeTask {
override def run(app: application.App, instance: PlayPadImpl): Unit = {
try ProfileReferenceManager.loadProfiles()
catch {
- case e@(_: IOException | _: DocumentException) =>
- Logger.error(e)
+ case e@(_: IOException | _: DocumentException) => Logger.error(e)
}
}
}
--
GitLab