From f5c6be9dd019577af92834058761e6a38184e1c0 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Tue, 12 Jul 2016 14:43:01 +0200
Subject: [PATCH] Use Updates.update to start update process
---
.../src/de/tobias/playpad/PlayPadMain.java | 26 +++++++++++++------
.../option/UpdateTabViewController.java | 16 +++++++++++-
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
index 9e2d8e98..9c8844d9 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
@@ -57,6 +57,7 @@ import de.tobias.playpad.trigger.VolumeTriggerItemConnect;
import de.tobias.playpad.update.PlayPadUpdater;
import de.tobias.playpad.update.Updatable;
import de.tobias.playpad.update.UpdateRegistery;
+import de.tobias.playpad.update.Updates;
import de.tobias.playpad.view.MapperOverviewViewController;
import de.tobias.playpad.viewcontroller.IPadSettingsViewController;
import de.tobias.playpad.viewcontroller.ISettingsViewController;
@@ -64,7 +65,6 @@ import de.tobias.playpad.viewcontroller.LaunchDialog;
import de.tobias.playpad.viewcontroller.dialog.ChangelogDialog;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.playpad.viewcontroller.main.MainViewController;
-import de.tobias.playpad.viewcontroller.option.UpdateTabViewController;
import de.tobias.utils.application.App;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
@@ -165,8 +165,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")));
}
}
@@ -176,7 +178,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
@@ -205,7 +208,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();
}
}
@@ -310,7 +314,8 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
pluginManager = PluginManagerFactory.createPluginManager();
if (ApplicationUtils.getApplication().isDebug())
// DEBUG PLUGINS EINBINDEN
- pluginManager.addPluginsFrom(Paths.get("/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWallPlugins/bin/").toUri());
+ pluginManager.addPluginsFrom(
+ Paths.get("/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWallPlugins/bin/").toUri());
else
pluginManager.addPluginsFrom(ApplicationUtils.getApplication().getPath(PathType.LIBRARY).toUri());
}
@@ -345,11 +350,16 @@ public class PlayPadMain extends Application implements LocalizationDelegate, Pl
alert.setContentText(Localization.getString(Strings.UI_Dialog_AutoUpdate_Content));
alert.showAndWait().filter(item -> item == ButtonType.OK).ifPresent(result ->
{
- UpdateTabViewController.update(null);
+ try {
+ Updates.update();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
});
});
}
- } catch (IOException | URISyntaxException e) {}
+ } catch (IOException | URISyntaxException e) {
+ }
});
}
}
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java
index 6c967a0d..72cc19c2 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/UpdateTabViewController.java
@@ -21,6 +21,7 @@ import de.tobias.playpad.settings.ProfileSettings;
import de.tobias.playpad.update.Updatable;
import de.tobias.playpad.update.UpdateChannel;
import de.tobias.playpad.update.UpdateRegistery;
+import de.tobias.playpad.update.Updates;
import de.tobias.playpad.viewcontroller.SettingsTabViewController;
import de.tobias.playpad.viewcontroller.cell.EnumCell;
import de.tobias.playpad.viewcontroller.cell.UpdateCell;
@@ -144,7 +145,17 @@ public class UpdateTabViewController extends SettingsTabViewController {
@FXML
private void updateHandler(ActionEvent event) {
- update(getStage());
+ UpdaterDialog dialog = new UpdaterDialog(getStage());
+ dialog.show();
+
+ Worker.runLater(() ->
+ {
+ try {
+ Updates.update();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ });
}
/**
@@ -154,6 +165,7 @@ public class UpdateTabViewController extends SettingsTabViewController {
* @param dialogOwner
* Window owner für Dialoge
*/
+ @Deprecated
public static void update(Window dialogOwner) {
// Parameter für Updater und Pfad für Downloads
App app = ApplicationUtils.getApplication();
@@ -175,6 +187,7 @@ public class UpdateTabViewController extends SettingsTabViewController {
* Owner window
* @param parameter
*/
+ @Deprecated
private static void macUpdate(Window dialogOwner, String parameter) {
try {
Path fileJar = Paths.get(UPDATER_JAR);
@@ -211,6 +224,7 @@ public class UpdateTabViewController extends SettingsTabViewController {
}
}
+ @Deprecated
private static void windowsUpdate(Window dialogOwner, String parameter, boolean admin) {
try {
Path fileExe = Paths.get(UPDATER_EXE);
--
GitLab