diff --git a/.idea/encodings.xml b/.idea/encodings.xml index a39835be1296c75a848c5bd3a5488429a804a4b2..573656f6b552ab704fd9f1ad893286475dda5049 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 cf64b19a2b485a981beb5db98b2f17d19dfa2587..9bb884fa0e75d7a36a93f352501f00041491bf31 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 9f9ff14a63c6a018cf242fa3e54525ca034cf247..c6f3b28b77789c34d7ab32e3d7e4c3161a457409 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) } } }