From db0a1e80f4bce438a58f3e5e1d417d08cf2dc5ea Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 15 Dec 2021 09:49:58 +0100
Subject: [PATCH] Format code
---
.../design/ModernDesignProviderImpl.java | 4 +-
.../initialize/PlayPadInitializeTask.java | 1 +
.../layout/desktop/pad/DesktopPadView.java | 6 +--
.../touch/TouchMenuToolbarViewController.java | 3 +-
.../layout/touch/pad/TouchPadView.java | 8 ++--
.../pad/listener/PadPositionListener.java | 1 -
.../playpad/trigger/VolumeTriggerItem.java | 8 ++--
.../tobias/playpad/update/VersionUpdater.java | 43 ++++++-------------
.../ModernCartDesignViewController.java | 2 +-
.../dialog/ModernPluginViewController.java | 5 +--
.../viewcontroller/main/AutosaveRunner.java | 28 ++++--------
.../main/MainViewController.java | 10 ++---
.../profile/GeneralTabViewController.java | 6 +--
.../WarningFeedbackViewController.java | 2 +-
.../design/ModernCartDesignHandlerImpl.scala | 14 +++---
.../ModernWarningDesignHandlerImpl.scala | 16 +++----
.../playpad/initialize/CheckUpdateTask.scala | 4 +-
.../MidiActionsInitializerTask.scala | 3 +-
.../initialize/NativeAppInitializerTask.scala | 1 +
.../initialize/OpenLastDocumentTask.scala | 4 +-
.../initialize/PluginLoadingTask.scala | 6 +--
.../initialize/ProfileLoadingTask.scala | 4 +-
.../initialize/ProjectParameterOpenTask.scala | 5 +--
.../initialize/ProjectsLoadingTask.scala | 1 +
.../initialize/ServerInitializeTask.scala | 4 +-
.../ServiceInitializationTask.scala | 1 +
.../initialize/VersionizerSetupTask.scala | 1 +
.../initialize/VolumeInitializerTask.scala | 1 +
.../playpad/update/VersionUpdaterTest.java | 6 +--
29 files changed, 80 insertions(+), 118 deletions(-)
diff --git a/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignProviderImpl.java b/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignProviderImpl.java
index 9e96bcc9..c1d2a552 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignProviderImpl.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignProviderImpl.java
@@ -4,8 +4,8 @@ import de.tobias.playpad.design.modern.ModernCartDesignHandler;
import de.tobias.playpad.design.modern.ModernGlobalDesignHandler;
import de.tobias.playpad.design.modern.ModernWarningDesignHandler;
-public class ModernDesignProviderImpl implements ModernDesignProvider
-{
+public class ModernDesignProviderImpl implements ModernDesignProvider {
+
private ModernWarningDesignHandler warningHandler;
private ModernCartDesignHandler cartDesignHandler;
private ModernGlobalDesignHandler globalDesignHandler;
diff --git a/PlayWall/src/main/java/de/tobias/playpad/initialize/PlayPadInitializeTask.java b/PlayWall/src/main/java/de/tobias/playpad/initialize/PlayPadInitializeTask.java
index c979364d..012c8173 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/initialize/PlayPadInitializeTask.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/initialize/PlayPadInitializeTask.java
@@ -5,5 +5,6 @@ import de.tobias.playpad.PlayPadImpl;
public interface PlayPadInitializeTask {
String name();
+
void run(App app, PlayPadImpl instance);
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
index 09038fa1..89968e77 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
@@ -358,12 +358,10 @@ public class DesktopPadView implements IPadView {
FeedbackDesignColorSuggester globalDesign = Profile.currentProfile().getProfileSettings().getDesign();
Color layoutStdColor = globalDesign.getDesignDefaultColor();
- if(pad != null)
- {
+ if (pad != null) {
final ModernCartDesign padDesign = pad.getPadSettings().getDesign();
- if(padDesign.isEnableCustomBackgroundColor())
- {
+ if (padDesign.isEnableCustomBackgroundColor()) {
layoutStdColor = padDesign.getDesignDefaultColor();
}
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index 51f0e319..3fb75001 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -157,7 +157,6 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
@Override
- public void initLayoutMenu()
- {
+ public void initLayoutMenu() {
}
}
\ No newline at end of file
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadView.java
index f0f20d4a..4ba78420 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadView.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadView.java
@@ -284,16 +284,14 @@ public class TouchPadView implements IPadView {
@Override
public void showNotFoundIcon(Pad pad, boolean show) {
- if(show) {
+ if (show) {
FeedbackDesignColorSuggester globalDesign = Profile.currentProfile().getProfileSettings().getDesign();
Color layoutStdColor = globalDesign.getDesignDefaultColor();
- if(pad != null)
- {
+ if (pad != null) {
final ModernCartDesign padDesign = pad.getPadSettings().getDesign();
- if(padDesign.isEnableCustomBackgroundColor())
- {
+ if (padDesign.isEnableCustomBackgroundColor()) {
layoutStdColor = padDesign.getDesignDefaultColor();
}
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
index e325c787..f1391287 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
@@ -3,7 +3,6 @@ package de.tobias.playpad.pad.listener;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.action.actions.CartAction;
import de.tobias.playpad.design.ModernDesignProvider;
-import de.tobias.playpad.design.modern.ModernGlobalDesignHandler;
import de.tobias.playpad.design.modern.ModernWarningDesignHandler;
import de.tobias.playpad.design.modern.model.ModernCartDesign;
import de.tobias.playpad.design.modern.model.ModernGlobalDesign;
diff --git a/PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItem.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItem.java
index 667c4aa9..96c9ca10 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItem.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItem.java
@@ -59,11 +59,11 @@ public class VolumeTriggerItem extends TriggerItem {
uuids.stream().map(project::getPad)
.filter(i -> i.getContent() instanceof Fadeable)
.forEach(destination -> {
- Fadeable fadeable = (Fadeable) destination.getContent();
+ Fadeable fadeable = (Fadeable) destination.getContent();
- final double start = VolumeManager.getInstance().computeVolume(destination);
- fadeable.fade(start, volume, duration, null);
- });
+ final double start = VolumeManager.getInstance().computeVolume(destination);
+ fadeable.fade(start, volume, duration, null);
+ });
}
@Override
diff --git a/PlayWall/src/main/java/de/tobias/playpad/update/VersionUpdater.java b/PlayWall/src/main/java/de/tobias/playpad/update/VersionUpdater.java
index 96fc17c2..3c8358dc 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/update/VersionUpdater.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/update/VersionUpdater.java
@@ -19,33 +19,25 @@ import java.nio.file.Path;
import java.text.MessageFormat;
import java.util.UUID;
-public class VersionUpdater implements UpdateService
-{
+public class VersionUpdater implements UpdateService {
@Override
- public void update(App app, long oldVersion, long newVersion)
- {
- try
- {
- if(oldVersion < 44)
- {
+ public void update(App app, long oldVersion, long newVersion) {
+ try {
+ if (oldVersion < 44) {
updateTo44(app);
}
- }
- catch(Exception e)
- {
+ } catch (Exception e) {
e.printStackTrace();
}
}
- private void updateTo44(App app) throws DocumentException, IOException
- {
+ private void updateTo44(App app) throws DocumentException, IOException {
Logger.debug("Updating to app version 44...");
SAXReader reader = new SAXReader();
Document projectsDocument = reader.read(Files.newInputStream(app.getPath(PathType.CONFIGURATION, "Projects.xml")));
- for(Element element : projectsDocument.getRootElement().elements("Project"))
- {
+ for (Element element : projectsDocument.getRootElement().elements("Project")) {
final String projectName = element.attributeValue("name");
final UUID projectUUID = UUID.fromString(element.attributeValue("uuid"));
@@ -59,39 +51,32 @@ public class VersionUpdater implements UpdateService
}
}
- public static Document updateProject(InputStream projectInputStream) throws DocumentException
- {
+ public static Document updateProject(InputStream projectInputStream) throws DocumentException {
SAXReader reader = new SAXReader();
Document projectDocument = reader.read(projectInputStream);
Element rootProjectElement = projectDocument.getRootElement();
- for(Element page : rootProjectElement.elements())
- {
- for(Element pad : page.elements())
- {
+ for (Element page : rootProjectElement.elements()) {
+ for (Element pad : page.elements()) {
final Element settings = pad.element("Settings");
- if(settings == null)
- {
+ if (settings == null) {
continue;
}
final Element designElement = settings.element("Design");
- if(designElement == null)
- {
+ if (designElement == null) {
continue;
}
final Attribute customFlag = designElement.attribute("custom");
- if(customFlag == null)
- {
+ if (customFlag == null) {
continue;
}
designElement.remove(customFlag);
- if(customFlag.getValue().equals("false"))
- {
+ if (customFlag.getValue().equals("false")) {
continue;
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
index 5ee94693..57d922e1 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
@@ -126,7 +126,7 @@ public class ModernCartDesignViewController extends NVC implements IColorButton
}
private String getLinearGradientCss(ModernColor color) {
- if(Profile.currentProfile().getProfileSettings().getDesign().isFlatDesign()) {
+ if (Profile.currentProfile().getProfileSettings().getDesign().isFlatDesign()) {
return "-fx-background-color: " + color.paint() + ";";
} else {
return "-fx-background-color: " + color.linearGradient() + ";";
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java
index 63e4ba8a..404bd0b4 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java
@@ -119,10 +119,9 @@ public class ModernPluginViewController extends NVC implements ChangeListener<Mo
pluginList.getSelectionModel().selectedItemProperty().addListener(this);
searchField.textProperty().addListener((observable, oldValue, newValue) -> {
- if(newValue == null || newValue.length() == 0) {
+ if (newValue == null || newValue.length() == 0) {
filteredData.setPredicate(s -> true);
- }
- else {
+ } else {
filteredData.setPredicate(p -> p.getDisplayName().contains(newValue));
}
});
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/AutosaveRunner.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/AutosaveRunner.java
index bffc1481..798e1d6b 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/AutosaveRunner.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/AutosaveRunner.java
@@ -6,32 +6,26 @@ import de.tobias.playpad.PlayPadPlugin;
import java.text.SimpleDateFormat;
import java.util.Date;
-public class AutosaveRunner implements Runnable
-{
+public class AutosaveRunner implements Runnable {
private final MainViewController mainViewController;
- public AutosaveRunner(MainViewController mainViewController)
- {
+ public AutosaveRunner(MainViewController mainViewController) {
this.mainViewController = mainViewController;
}
@Override
- public void run()
- {
+ public void run() {
long lastSaveTime = System.currentTimeMillis();
final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- while(!Thread.interrupted())
- {
+ while (!Thread.interrupted()) {
final long currentMillis = System.currentTimeMillis();
// autosave interval may be changed by user in global settings, therefore the current setting needs to be fetched every time
- if(currentMillis > lastSaveTime + getAutosaveIntervalInMillis())
- {
+ if (currentMillis > lastSaveTime + getAutosaveIntervalInMillis()) {
lastSaveTime = currentMillis;
- if(PlayPadPlugin.getInstance().getGlobalSettings().isEnableAutosave())
- {
+ if (PlayPadPlugin.getInstance().getGlobalSettings().isEnableAutosave()) {
Logger.debug("Performing autosave...");
mainViewController.save();
@@ -40,20 +34,16 @@ public class AutosaveRunner implements Runnable
}
}
- try
- {
+ try {
//noinspection BusyWait
Thread.sleep(10 * 1000L);
- }
- catch(InterruptedException e)
- {
+ } catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}
- private long getAutosaveIntervalInMillis()
- {
+ private long getAutosaveIntervalInMillis() {
return PlayPadPlugin.getInstance().getGlobalSettings().getAutosaveIntervalInMinutes() * 60 * 1000L;
}
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
index d1a3aff9..68a0de52 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
@@ -370,8 +370,7 @@ public class MainViewController extends NVC implements IMainViewController, Noti
}
}
- if(autosaveThread != null && autosaveThread.isAlive())
- {
+ if (autosaveThread != null && autosaveThread.isAlive()) {
Logger.debug("Stopping autosave thread");
autosaveThread.interrupt();
}
@@ -803,8 +802,7 @@ public class MainViewController extends NVC implements IMainViewController, Noti
@Override
public void save() {
- try
- {
+ try {
ProjectReferenceManager.saveProjects();
ProjectReferenceManager.saveSingleProject(openProject);
ProfileReferenceManager.saveProfiles();
@@ -812,9 +810,7 @@ public class MainViewController extends NVC implements IMainViewController, Noti
PlayPadPlugin.getInstance().getGlobalSettings().save();
notify(Localization.getString(Strings.STANDARD_FILE_SAVE), PlayPadMain.NOTIFICATION_DISPLAY_TIME);
- }
- catch(IOException e)
- {
+ } catch (IOException e) {
showError(Localization.getString(Strings.ERROR_PROJECT_SAVE));
Logger.error(e);
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
index 1b9cb3ea..ee68975e 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
@@ -84,8 +84,7 @@ public class GeneralTabViewController extends GlobalSettingsTabViewController {
enableAutosaveCheckbox.selectedProperty().addListener((observable, oldValue, newValue) -> autosaveIntervalTextField.setDisable(!newValue));
}
- private void disableLiveSettings(Boolean enableLiveSettings)
- {
+ private void disableLiveSettings(Boolean enableLiveSettings) {
pageEnable.setDisable(!enableLiveSettings);
pageDisable.setDisable(!enableLiveSettings);
dragEnable.setDisable(!enableLiveSettings);
@@ -211,8 +210,7 @@ public class GeneralTabViewController extends GlobalSettingsTabViewController {
try {
final int autosaveInterval = Integer.parseInt(autosaveIntervalTextField.getText());
return autosaveInterval > 0;
- }
- catch(NumberFormatException e) {
+ } catch (NumberFormatException e) {
return false;
}
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
index dfe3087c..74762ff9 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
@@ -34,7 +34,7 @@ public class WarningFeedbackViewController extends NVC {
return controller;
}
- public static WarningFeedbackViewController newViewControllerForPad() {
+ public static WarningFeedbackViewController newViewControllerForPad() {
return new WarningFeedbackViewController();
}
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 945eddab..51039642 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernCartDesignHandlerImpl.scala
@@ -17,19 +17,16 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
override def generateCss(design: ModernCartDesign, classSuffix: String, flat: Boolean): String = {
var result = ""
- if(design.isEnableCustomBackgroundColor)
- {
- result += generatePadCss(design, flat, classSuffix, design.getBackgroundColor)
+ if (design.isEnableCustomBackgroundColor) {
+ result += generatePadCss(design, flat, classSuffix, design.getBackgroundColor)
result += generatePadCss(design, flat, classSuffix, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}")
}
- if(design.isEnableCustomPlayColor)
- {
+ if (design.isEnableCustomPlayColor) {
result += generatePadCss(design, flat, classSuffix, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}")
}
- if(design.isEnableCustomCueInColor)
- {
+ if (design.isEnableCustomCueInColor) {
result += generateCueInCss(design, flat, classSuffix)
}
@@ -60,8 +57,7 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
generateCss("style/modern-pad-cue-in.css", values)
}
- private def generateCss(templatePath: String, values: Map[String, AnyRef]): String =
- {
+ private def generateCss(templatePath: String, values: Map[String, AnyRef]): String = {
val expressionParser: ExpressionParser = new SpelExpressionParser()
val context = new StandardEvaluationContext()
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernWarningDesignHandlerImpl.scala b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernWarningDesignHandlerImpl.scala
index 5e288d06..30a8c490 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernWarningDesignHandlerImpl.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernWarningDesignHandlerImpl.scala
@@ -8,13 +8,13 @@ import javafx.util.Duration
class ModernWarningDesignHandlerImpl extends ModernWarningDesignHandler {
- override def performWarning(design: ModernGlobalDesign, fadeStartColor: FadeableColor, fadeStopColor: FadeableColor, controller: AbstractPadViewController, warningDuration: Duration): Unit = {
- if (design.isWarnAnimation) {
- ModernDesignAnimator.animateWarn(controller, fadeStartColor, fadeStopColor, warningDuration)
- } else {
- ModernDesignAnimator.warnFlash(controller)
- }
- }
+ override def performWarning(design: ModernGlobalDesign, fadeStartColor: FadeableColor, fadeStopColor: FadeableColor, controller: AbstractPadViewController, warningDuration: Duration): Unit = {
+ if (design.isWarnAnimation) {
+ ModernDesignAnimator.animateWarn(controller, fadeStartColor, fadeStopColor, warningDuration)
+ } else {
+ ModernDesignAnimator.warnFlash(controller)
+ }
+ }
- override def stopWarning(controller: AbstractPadViewController): Unit = ModernDesignAnimator.stopAnimation(controller)
+ override def stopWarning(controller: AbstractPadViewController): Unit = ModernDesignAnimator.stopAnimation(controller)
}
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/CheckUpdateTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/CheckUpdateTask.scala
index a9e68db3..f5c6704b 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/CheckUpdateTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/CheckUpdateTask.scala
@@ -1,7 +1,5 @@
package de.tobias.playpad.initialize
-import java.io.IOException
-
import de.thecodelabs.logger.Logger
import de.thecodelabs.utils.application
import de.thecodelabs.utils.threading.Worker
@@ -10,6 +8,8 @@ import de.tobias.playpad.viewcontroller.dialog.AutoUpdateDialog
import javafx.application.Platform
import javafx.scene.control.ButtonType
+import java.io.IOException
+
class CheckUpdateTask extends PlayPadInitializeTask {
override def name(): String = "Updates"
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/MidiActionsInitializerTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/MidiActionsInitializerTask.scala
index fab6bfe1..7ca988c7 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/MidiActionsInitializerTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/MidiActionsInitializerTask.scala
@@ -1,10 +1,11 @@
package de.tobias.playpad.initialize
+
import de.thecodelabs.midi.action.{ActionKeyHandler, ActionRegistry}
import de.thecodelabs.midi.midi.MidiCommandHandler
import de.thecodelabs.utils.application
-import de.tobias.playpad.{PlayPadImpl, PlayPadPlugin}
import de.tobias.playpad.action.ActionProvider
import de.tobias.playpad.midi.PD12
+import de.tobias.playpad.{PlayPadImpl, PlayPadPlugin}
class MidiActionsInitializerTask extends PlayPadInitializeTask {
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/NativeAppInitializerTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/NativeAppInitializerTask.scala
index 5afd167f..96b15a5d 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/NativeAppInitializerTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/NativeAppInitializerTask.scala
@@ -1,4 +1,5 @@
package de.tobias.playpad.initialize
+
import de.thecodelabs.utils.application
import de.thecodelabs.utils.application.system.NativeApplication
import de.tobias.playpad.PlayPadImpl
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/OpenLastDocumentTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/OpenLastDocumentTask.scala
index c518daba..1d3b58cc 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/OpenLastDocumentTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/OpenLastDocumentTask.scala
@@ -1,12 +1,12 @@
package de.tobias.playpad.initialize
-import java.util.UUID
-
import de.thecodelabs.utils.application
import de.tobias.playpad.PlayPadImpl
import de.tobias.playpad.project.ref.ProjectReferenceManager
import javafx.application.Platform
+import java.util.UUID
+
class OpenLastDocumentTask extends PlayPadInitializeTask {
override def name(): String = "Open Last Document"
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/PluginLoadingTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/PluginLoadingTask.scala
index 7b4d7bac..04ab9448 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/PluginLoadingTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/PluginLoadingTask.scala
@@ -1,8 +1,5 @@
package de.tobias.playpad.initialize
-import java.io.IOException
-import java.nio.file.{Path, Paths}
-
import de.thecodelabs.logger.Logger
import de.thecodelabs.utils.application
import de.thecodelabs.utils.application.ApplicationUtils
@@ -12,6 +9,9 @@ import de.tobias.playpad.plugin.ModernPluginManager
import javafx.application.Platform
import org.controlsfx.dialog.ExceptionDialog
+import java.io.IOException
+import java.nio.file.{Path, Paths}
+
class PluginLoadingTask extends PlayPadInitializeTask {
override def name(): String = "Plugins"
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 c6f3b28b..490bddc2 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProfileLoadingTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProfileLoadingTask.scala
@@ -1,13 +1,13 @@
package de.tobias.playpad.initialize
-import java.io.IOException
-
import de.thecodelabs.logger.Logger
import de.thecodelabs.utils.application
import de.tobias.playpad.PlayPadImpl
import de.tobias.playpad.profile.ref.ProfileReferenceManager
import org.dom4j.DocumentException
+import java.io.IOException
+
class ProfileLoadingTask extends PlayPadInitializeTask {
override def name(): String = "Profile loading"
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectParameterOpenTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectParameterOpenTask.scala
index a659cbc9..7a37af3e 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectParameterOpenTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectParameterOpenTask.scala
@@ -1,11 +1,10 @@
package de.tobias.playpad.initialize
-import java.util.UUID
-
import de.thecodelabs.utils.application
import de.tobias.playpad.PlayPadImpl
import de.tobias.playpad.project.ref.ProjectReferenceManager
-;
+
+import java.util.UUID;
class ProjectParameterOpenTask extends PlayPadInitializeTask {
override def name(): String = "Open"
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectsLoadingTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectsLoadingTask.scala
index b2bc99af..4609a499 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectsLoadingTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ProjectsLoadingTask.scala
@@ -1,4 +1,5 @@
package de.tobias.playpad.initialize
+
import de.thecodelabs.utils.application
import de.tobias.playpad.PlayPadImpl
import de.tobias.playpad.project.ref.ProjectReferenceManager
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServerInitializeTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServerInitializeTask.scala
index a55c2ad0..374708db 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServerInitializeTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServerInitializeTask.scala
@@ -1,13 +1,13 @@
package de.tobias.playpad.initialize
-import java.io.IOException
-
import com.neovisionaries.ws.client.WebSocketException
import de.thecodelabs.logger.Logger
import de.thecodelabs.utils.application
import de.tobias.playpad.server.{Session, SessionDelegate, SessionNotExistsException}
import de.tobias.playpad.{PlayPadImpl, PlayPadPlugin}
+import java.io.IOException
+
class ServerInitializeTask(delegate: SessionDelegate) extends PlayPadInitializeTask {
override def name(): String = "Server"
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServiceInitializationTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServiceInitializationTask.scala
index 7c7795ee..30dee76b 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServiceInitializationTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/ServiceInitializationTask.scala
@@ -1,4 +1,5 @@
package de.tobias.playpad.initialize
+
import de.thecodelabs.utils.application
import de.tobias.playpad.server.ServerHandlerImpl
import de.tobias.playpad.server.sync.command.CommandExecutorHandlerImpl
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/VersionizerSetupTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/VersionizerSetupTask.scala
index 3c78ccb9..7a5f9569 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/VersionizerSetupTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/VersionizerSetupTask.scala
@@ -1,4 +1,5 @@
package de.tobias.playpad.initialize
+
import de.thecodelabs.storage.settings.StorageTypes
import de.thecodelabs.utils.application
import de.thecodelabs.utils.util.SystemUtils
diff --git a/PlayWall/src/main/scala/de/tobias/playpad/initialize/VolumeInitializerTask.scala b/PlayWall/src/main/scala/de/tobias/playpad/initialize/VolumeInitializerTask.scala
index a09ddf7f..4018cba0 100644
--- a/PlayWall/src/main/scala/de/tobias/playpad/initialize/VolumeInitializerTask.scala
+++ b/PlayWall/src/main/scala/de/tobias/playpad/initialize/VolumeInitializerTask.scala
@@ -1,4 +1,5 @@
package de.tobias.playpad.initialize
+
import de.thecodelabs.utils.application
import de.tobias.playpad.PlayPadImpl
import de.tobias.playpad.volume.{GlobalVolume, PadVolume, VolumeManager}
diff --git a/PlayWall/src/test/java/de/tobias/playpad/update/VersionUpdaterTest.java b/PlayWall/src/test/java/de/tobias/playpad/update/VersionUpdaterTest.java
index 15339be0..e3161ec9 100644
--- a/PlayWall/src/test/java/de/tobias/playpad/update/VersionUpdaterTest.java
+++ b/PlayWall/src/test/java/de/tobias/playpad/update/VersionUpdaterTest.java
@@ -9,11 +9,9 @@ import java.io.InputStream;
import static org.assertj.core.api.Assertions.assertThat;
-public class VersionUpdaterTest
-{
+public class VersionUpdaterTest {
@Test
- public void testMigrateProject_UpdatePadDesignSettings() throws DocumentException
- {
+ public void testMigrateProject_UpdatePadDesignSettings() throws DocumentException {
final InputStream projectInputStream = VersionUpdaterTest.class.getClassLoader().getResourceAsStream("de/tobias/playpad/update/ProjectToMigrateToVersion44.xml");
final Document migratedProject = VersionUpdater.updateProject(projectInputStream);
--
GitLab