Skip to content
Snippets Groups Projects
Commit 1451c5c2 authored by tobias's avatar tobias
Browse files

Refractor code

parent 1171c182
No related branches found
No related tags found
No related merge requests found
...@@ -117,9 +117,9 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl ...@@ -117,9 +117,9 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
public static final long displayTimeMillis = 1500; public static final long displayTimeMillis = 1500;
public static final String[] projectType = { "*.xml" }; public static final String projectType = "*.xml";
public static final String[] projectZIPType = { "*.zip" }; public static final String projectZIPType = "*.zip";
public static final String[] midiPresetType = { "*.pre" }; public static final String midiPresetType = "*.pre";
private static ResourceBundle uiResourceBundle; private static ResourceBundle uiResourceBundle;
private static MainViewController mainViewController; private static MainViewController mainViewController;
...@@ -164,8 +164,10 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl ...@@ -164,8 +164,10 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
// Console // Console
if (!ApplicationUtils.getApplication().isDebug()) { if (!ApplicationUtils.getApplication().isDebug()) {
System.setOut(ConsoleUtils.streamToFile(ApplicationUtils.getApplication().getPath(PathType.LOG, "out.log"))); System.setOut(
System.setErr(ConsoleUtils.streamToFile(ApplicationUtils.getApplication().getPath(PathType.LOG, "err.log"))); 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 ...@@ -175,7 +177,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
try { try {
Image stageIcon = new Image(iconPath); Image stageIcon = new Image(iconPath);
PlayPadMain.stageIcon = Optional.of(stageIcon); PlayPadMain.stageIcon = Optional.of(stageIcon);
} catch (Exception e) {} } catch (Exception e) {
}
/* /*
* Setup * Setup
...@@ -212,7 +215,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl ...@@ -212,7 +215,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
UUID uuid = UUID.fromString(getParameters().getNamed().get("project")); UUID uuid = UUID.fromString(getParameters().getNamed().get("project"));
launchProject(Project.load(ProjectReference.getProject(uuid), true, null)); launchProject(Project.load(ProjectReference.getProject(uuid), true, null));
return; return;
} catch (IllegalArgumentException | NullPointerException e) {} catch (Exception e) { } catch (IllegalArgumentException | NullPointerException e) {
} catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
...@@ -459,8 +463,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl ...@@ -459,8 +463,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
} }
@Override @Override
public String[] getProjectFiles() { public String[] getProjectFileTypes() {
return projectType; return new String[] { projectType };
} }
@Override @Override
......
...@@ -29,8 +29,8 @@ public class DuplicateProjectDialog extends TextInputDialog { ...@@ -29,8 +29,8 @@ public class DuplicateProjectDialog extends TextInputDialog {
setResultConverter(button -> setResultConverter(button ->
{ {
String param = getEditor().getText(); String param = getEditor().getText();
if (!param.endsWith(PlayPadMain.projectType[0].substring(1))) { if (!param.endsWith(PlayPadMain.projectType.substring(1))) {
param += PlayPadMain.projectType[0].substring(1); param += PlayPadMain.projectType.substring(1);
} }
ButtonData data = button == null ? null : button.getButtonData(); ButtonData data = button == null ? null : button.getButtonData();
......
...@@ -73,7 +73,7 @@ public class ImportDialog implements Importable, ProfileChooseable { ...@@ -73,7 +73,7 @@ public class ImportDialog implements Importable, ProfileChooseable {
@Override @Override
public String replaceProject(String name) { 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.initOwner(getStage());
alert.initModality(Modality.WINDOW_MODAL); alert.initModality(Modality.WINDOW_MODAL);
alert.setContentText(Localization.getString(Strings.UI_Dialog_Import_ReplaceProject_ReplaceContent, name)); alert.setContentText(Localization.getString(Strings.UI_Dialog_Import_ReplaceProject_ReplaceContent, name));
......
...@@ -12,6 +12,14 @@ import de.tobias.playpad.viewcontroller.main.IMainViewController; ...@@ -12,6 +12,14 @@ import de.tobias.playpad.viewcontroller.main.IMainViewController;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import net.xeoh.plugins.base.PluginManager; 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 { public interface PlayPad {
/** /**
...@@ -30,6 +38,7 @@ public interface PlayPad { ...@@ -30,6 +38,7 @@ public interface PlayPad {
* *
* @since 2.0.0 * @since 2.0.0
*/ */
@Deprecated
public void removeMainViewListener(WindowListener<IMainViewController> listener); public void removeMainViewListener(WindowListener<IMainViewController> listener);
/** /**
...@@ -39,6 +48,7 @@ public interface PlayPad { ...@@ -39,6 +48,7 @@ public interface PlayPad {
* *
* @since 2.0.0 * @since 2.0.0
*/ */
@Deprecated
public void addSettingsViewListener(WindowListener<ISettingsViewController> listener); public void addSettingsViewListener(WindowListener<ISettingsViewController> listener);
/** /**
...@@ -48,8 +58,10 @@ public interface PlayPad { ...@@ -48,8 +58,10 @@ public interface PlayPad {
* *
* @since 2.0.0 * @since 2.0.0
*/ */
@Deprecated
public void removeSettingsViewListener(WindowListener<ISettingsViewController> listener); public void removeSettingsViewListener(WindowListener<ISettingsViewController> listener);
@Deprecated
public List<WindowListener<ISettingsViewController>> getSettingsViewListener(); public List<WindowListener<ISettingsViewController>> getSettingsViewListener();
/** /**
...@@ -59,6 +71,7 @@ public interface PlayPad { ...@@ -59,6 +71,7 @@ public interface PlayPad {
* *
* @since 2.0.0 * @since 2.0.0
*/ */
@Deprecated
public void addPadSettingsViewListener(WindowListener<IPadSettingsViewController> listener); public void addPadSettingsViewListener(WindowListener<IPadSettingsViewController> listener);
/** /**
...@@ -68,8 +81,10 @@ public interface PlayPad { ...@@ -68,8 +81,10 @@ public interface PlayPad {
* *
* @since 2.0.0 * @since 2.0.0
*/ */
@Deprecated
public void removePadSettingsViewListener(WindowListener<IPadSettingsViewController> listener); public void removePadSettingsViewListener(WindowListener<IPadSettingsViewController> listener);
@Deprecated
public List<WindowListener<IPadSettingsViewController>> getPadSettingsViewListener(); public List<WindowListener<IPadSettingsViewController>> getPadSettingsViewListener();
/** /**
...@@ -102,7 +117,13 @@ public interface PlayPad { ...@@ -102,7 +117,13 @@ public interface PlayPad {
public PluginManager getPluginManager(); public PluginManager getPluginManager();
public String[] getProjectFiles(); @Deprecated
public String[] getProjectFileTypes();
/**
* Gibt das Programmicon zurück.
*
* @return Programmicon
*/
public Optional<Image> getIcon(); public Optional<Image> getIcon();
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment