From 1451c5c24aa7f5920e6605aed6ebb221852f3923 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Sun, 24 Jul 2016 18:41:47 +0200
Subject: [PATCH] Refractor code
---
.../src/de/tobias/playpad/PlayPadMain.java | 22 +++++++++-------
.../dialog/DuplicateProjectDialog.java | 4 +--
.../viewcontroller/dialog/ImportDialog.java | 2 +-
.../src/de/tobias/playpad/PlayPad.java | 25 +++++++++++++++++--
4 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
index 5831f9a0..901fd724 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
@@ -117,9 +117,9 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
public static final long displayTimeMillis = 1500;
- public static final String[] projectType = { "*.xml" };
- public static final String[] projectZIPType = { "*.zip" };
- public static final String[] midiPresetType = { "*.pre" };
+ public static final String projectType = "*.xml";
+ public static final String projectZIPType = "*.zip";
+ public static final String midiPresetType = "*.pre";
private static ResourceBundle uiResourceBundle;
private static MainViewController mainViewController;
@@ -164,8 +164,10 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
// Console
if (!ApplicationUtils.getApplication().isDebug()) {
- System.setOut(ConsoleUtils.streamToFile(ApplicationUtils.getApplication().getPath(PathType.LOG, "out.log")));
- System.setErr(ConsoleUtils.streamToFile(ApplicationUtils.getApplication().getPath(PathType.LOG, "err.log")));
+ System.setOut(
+ ConsoleUtils.streamToFile(ApplicationUtils.getApplication().getPath(PathType.LOG, "out.log")));
+ System.setErr(
+ ConsoleUtils.streamToFile(ApplicationUtils.getApplication().getPath(PathType.LOG, "err.log")));
}
}
@@ -175,7 +177,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
try {
Image stageIcon = new Image(iconPath);
PlayPadMain.stageIcon = Optional.of(stageIcon);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ }
/*
* Setup
@@ -212,7 +215,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
UUID uuid = UUID.fromString(getParameters().getNamed().get("project"));
launchProject(Project.load(ProjectReference.getProject(uuid), true, null));
return;
- } catch (IllegalArgumentException | NullPointerException e) {} catch (Exception e) {
+ } catch (IllegalArgumentException | NullPointerException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -459,8 +463,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
}
@Override
- public String[] getProjectFiles() {
- return projectType;
+ public String[] getProjectFileTypes() {
+ return new String[] { projectType };
}
@Override
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/DuplicateProjectDialog.java b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/DuplicateProjectDialog.java
index 2b3b7505..180f5230 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/DuplicateProjectDialog.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/DuplicateProjectDialog.java
@@ -29,8 +29,8 @@ public class DuplicateProjectDialog extends TextInputDialog {
setResultConverter(button ->
{
String param = getEditor().getText();
- if (!param.endsWith(PlayPadMain.projectType[0].substring(1))) {
- param += PlayPadMain.projectType[0].substring(1);
+ if (!param.endsWith(PlayPadMain.projectType.substring(1))) {
+ param += PlayPadMain.projectType.substring(1);
}
ButtonData data = button == null ? null : button.getButtonData();
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ImportDialog.java b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ImportDialog.java
index a1e8fbf6..e5e1ba47 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ImportDialog.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ImportDialog.java
@@ -73,7 +73,7 @@ public class ImportDialog implements Importable, ProfileChooseable {
@Override
public String replaceProject(String name) {
- TextInputDialog alert = new TextInputDialog(name.replace(PlayPadMain.projectType[0].substring(1), ""));
+ TextInputDialog alert = new TextInputDialog(name.replace(PlayPadMain.projectType.substring(1), ""));
alert.initOwner(getStage());
alert.initModality(Modality.WINDOW_MODAL);
alert.setContentText(Localization.getString(Strings.UI_Dialog_Import_ReplaceProject_ReplaceContent, name));
diff --git a/PlayWallCore/src/de/tobias/playpad/PlayPad.java b/PlayWallCore/src/de/tobias/playpad/PlayPad.java
index e0a6546c..293a1a6c 100644
--- a/PlayWallCore/src/de/tobias/playpad/PlayPad.java
+++ b/PlayWallCore/src/de/tobias/playpad/PlayPad.java
@@ -12,6 +12,14 @@ import de.tobias.playpad.viewcontroller.main.IMainViewController;
import javafx.scene.image.Image;
import net.xeoh.plugins.base.PluginManager;
+/**
+ * Hauptfunktionen für Listener und zur Programmsteuerung für Plugins.
+ *
+ * @author tobias
+ *
+ * @since 5.0.0
+ *
+ */
public interface PlayPad {
/**
@@ -30,6 +38,7 @@ public interface PlayPad {
*
* @since 2.0.0
*/
+ @Deprecated
public void removeMainViewListener(WindowListener<IMainViewController> listener);
/**
@@ -39,6 +48,7 @@ public interface PlayPad {
*
* @since 2.0.0
*/
+ @Deprecated
public void addSettingsViewListener(WindowListener<ISettingsViewController> listener);
/**
@@ -48,8 +58,10 @@ public interface PlayPad {
*
* @since 2.0.0
*/
+ @Deprecated
public void removeSettingsViewListener(WindowListener<ISettingsViewController> listener);
+ @Deprecated
public List<WindowListener<ISettingsViewController>> getSettingsViewListener();
/**
@@ -59,6 +71,7 @@ public interface PlayPad {
*
* @since 2.0.0
*/
+ @Deprecated
public void addPadSettingsViewListener(WindowListener<IPadSettingsViewController> listener);
/**
@@ -68,8 +81,10 @@ public interface PlayPad {
*
* @since 2.0.0
*/
+ @Deprecated
public void removePadSettingsViewListener(WindowListener<IPadSettingsViewController> listener);
+ @Deprecated
public List<WindowListener<IPadSettingsViewController>> getPadSettingsViewListener();
/**
@@ -102,7 +117,13 @@ public interface PlayPad {
public PluginManager getPluginManager();
- public String[] getProjectFiles();
-
+ @Deprecated
+ public String[] getProjectFileTypes();
+
+ /**
+ * Gibt das Programmicon zurück.
+ *
+ * @return Programmicon
+ */
public Optional<Image> getIcon();
}
--
GitLab