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 9e96bcc90e115741f47183b1a5709da5e7767cae..c1d2a5521b5de332a8efdfc3f2eaac933dcc6117 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 c979364d11375530570ee5ae60705a9c9e89e194..012c8173a7d06cf73908f455c0a32073f8f8c180 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 09038fa1959a241e22247f06c6ae34ea83daf2c6..89968e77a9c79ae23d8d5f6f54728f2f2d791042 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 51f0e31995aa4d5ab5744a4fde399b749e1a73c0..3fb75001df01637862485a3527bba1ff909218f0 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 f0f20d4a74d40b4548e5276711cc3da60860a852..4ba78420683b47d6ee938cf836364b085f80261d 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 e325c7877dd59f83dbb70accf9dc16fb0ae71771..f1391287b7c465cbd3d5fb7a6c018e195e2de71f 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 667c4aa90b0cb045c1655a0ccea97a897061979a..96c9ca10899eb9ec564720a974414acce4d05f1c 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 96fc17c2f4c66c96fd4b8e5d9d4a26a0d80ff86d..3c8358dc70cc5fdaa69c8e022bbb83dbcfbaec8c 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 5ee9469334a4ee1ee5649fd4adbab2e02a1c6048..57d922e1253e9bcad2fb833cff26edcc37d6f416 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 63e4ba8a4d673f84251840133cde64e92b98eab3..404bd0b40960162ecec8d5fd7a4f0dad526c2aa7 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 bffc1481226896694b9aad6683c047cc5b389b41..798e1d6bfef655758abb566b1fda26b180c73cf9 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 d1a3aff9f30090ab4b0bbd065b68dfd7fcee9b6d..68a0de522f978907d687bbe78c6888cc9eb7704b 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 1b9cb3eae11e0dafe64e84863e440d3becea5a88..ee68975eac82cdee8cf838c1c616733af5af04e1 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 dfe3087c7e911b035ddfa39ba83f795ed0eaa19a..74762ff9671799447a7436b74c3a2a54df3763db 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 945eddab9b05903d35ceed1e7b0b189be15315fb..510396427c75841ea6755d11c5795ba0d3e78743 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 5e288d06813b1e649212c703fc51e60c1afcc4bb..30a8c490f5c00a9ae5a5171644f808a78adb8b16 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 a9e68db3161f8184b972dea93a5cd82d4ea9a704..f5c6704b2f45be82bba39fad6b945adb023385ed 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 fab6bfe1c728a1edd52772cad91b767b95cc40e2..7ca988c7db723dd776e3fc3ade467bbd13200e5f 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 5afd167f0dc959eb7ac44277ea4e5b9d5acab202..96b15a5dd8aedca5c8be678ad84926d0d6ad991c 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 c518daba0cd81d8a5465ee35f2f89b8d7d51c978..1d3b58cc5d22bc912f93c6de9ea289f2bd183ec9 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 7b4d7bacf7a75ff8a6ee3ad8e67cd9a523ed6ffc..04ab9448cfae14e988a7701da0ea583e131b1733 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 c6f3b28b77789c34d7ab32e3d7e4c3161a457409..490bddc2ed93996df80b17d08a25657d91ca314d 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 a659cbc9bc55ffca0883c8dc824f0af23ca1a609..7a37af3e49bce98f4b3c63145354db9172cad3d7 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 b2bc99af6d57599077d177dd93a8e732b9606132..4609a499f17254359e38d0e5764ff18e6a2473e0 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 a55c2ad0272c3176d8f8b0da730269b4bc23a9c3..374708dbf113f87f1c002024b89d2ef1473fe99c 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 7c7795ee81249b886ce185cd11ff51a3de2cbb52..30dee76bd1c7082fbf9ba30c17448ed0259520ea 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 3c78ccb991a479e5df94f17e0b0efd6320d2f1fb..7a5f95697a0a78f3ef4d58dc4c631b7e28339f48 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 a09ddf7f3f9bbd541478bbd6f6c16b232f1129bf..4018cba0446f88b295d7ae357c88c43d91b205a4 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 15339be0643a1dc3aa66ae68d6a7735129be8e0a..e3161ec958483f5dad5406ae20de2a8043f4203e 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);