server
Clone or download
Modified Files
--- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java'
+++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java
@@ -722,8 +722,8 @@ public class ClientConnection extends Th
sendMessage(message);
}
- public void actionClicked(Message message) {
-
+ public void actionClicked(Message message)
+ {
try
{
String[] r = message.getStringArrValue();
--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -455,14 +455,13 @@ public class Controller extends Base imp
}
@Override
- public void handleMinorException(MinorException e) {
+ public void handleMinorException(MinorException e)
+ {
getLogger().log(Level.SEVERE, e.getMessage(), e);
e.printStackTrace();
- Platform.runLater(()->{
- new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.WARNING).show();
- });
+ Platform.runLater(()-> new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.WARNING).show());
}
@Override
@@ -530,8 +529,10 @@ public class Controller extends Base imp
}
@Override
- public void saveServerProperties() {
- try {
+ public void saveServerProperties()
+ {
+ try
+ {
NormalActionPlugins.getInstance().saveServerSettings();
getSettingsPane().getPluginsSettings().loadPlugins();
} catch (MinorException e) {
@@ -542,6 +543,6 @@ public class Controller extends Base imp
@Override
public com.stream_pi.util.platform.Platform getPlatform() {
- return ServerInfo.getInstance().getPlatformType();
+ return ServerInfo.getInstance().getPlatform();
}
}
--- 'a/src/main/java/com/stream_pi/server/info/ServerInfo.java'
+++ b/src/main/java/com/stream_pi/server/info/ServerInfo.java
@@ -15,7 +15,7 @@ import com.stream_pi.util.version.Versio
public class ServerInfo {
private Version version;
private final ReleaseStatus releaseStatus;
- private final Platform platformType;
+ private final Platform platform;
private String prePath;
@@ -41,13 +41,13 @@ public class ServerInfo {
String osName = System.getProperty("os.name").toLowerCase();
if(osName.contains("windows"))
- platformType = Platform.WINDOWS;
+ platform = Platform.WINDOWS;
else if (osName.contains("linux"))
- platformType = Platform.LINUX;
+ platform = Platform.LINUX;
else if (osName.contains("mac"))
- platformType = Platform.MAC;
+ platform = Platform.MAC;
else
- platformType = Platform.UNKNOWN;
+ platform = Platform.UNKNOWN;
}
@@ -87,9 +87,9 @@ public class ServerInfo {
}
- public Platform getPlatformType()
+ public Platform getPlatform()
{
- return platformType;
+ return platform;
}
public Version getVersion() {
--- 'a/src/main/java/com/stream_pi/server/window/Base.java'
+++ b/src/main/java/com/stream_pi/server/window/Base.java
@@ -76,7 +76,7 @@ public abstract class Base extends Stack
{
String path = ServerInfo.getInstance().getPrePath()+"../stream-pi-server.log";
- if(ServerInfo.getInstance().getPlatformType() == Platform.ANDROID)
+ if(ServerInfo.getInstance().getPlatform() == Platform.ANDROID)
path = ServerInfo.getInstance().getPrePath()+"stream-pi-server.log";
logFileHandler = new StreamPiLogFileHandler(path);
--- 'a/src/main/java/com/stream_pi/server/window/settings/About.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/About.java
@@ -75,7 +75,7 @@ public class About extends VBox{
ServerInfo serverInfo = ServerInfo.getInstance();
- Label versionText = new Label(serverInfo.getVersion().getText() + " - "+ serverInfo.getPlatformType().getUIName() + " - "+ serverInfo.getReleaseStatus().getUIName());
+ Label versionText = new Label(serverInfo.getVersion().getText() + " - "+ serverInfo.getPlatform().getUIName() + " - "+ serverInfo.getReleaseStatus().getUIName());
versionText.getStyleClass().add("about_version_label");
Label commStandardLabel = new Label("Comm Standard "+serverInfo.getCommStandardVersion().getText());
--- 'a/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java
@@ -8,6 +8,7 @@ import com.stream_pi.server.info.ServerI
import com.stream_pi.util.alert.StreamPiAlert;
import com.stream_pi.util.alert.StreamPiAlertType;
import com.stream_pi.util.checkforupdates.CheckForUpdates;
+import com.stream_pi.util.checkforupdates.UpdateHyperlinkOnClick;
import com.stream_pi.util.exception.MinorException;
import com.stream_pi.util.exception.SevereException;
import com.stream_pi.util.platform.PlatformType;
@@ -16,6 +17,7 @@ import com.stream_pi.util.version.Versio
import javafx.application.HostServices;
import javafx.application.Platform;
import javafx.concurrent.Task;
+import javafx.event.ActionEvent;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.*;
@@ -117,8 +119,13 @@ public class GeneralSettings extends VBo
private void checkForUpdates()
{
- new CheckForUpdates(checkForUpdatesButton, hostServices,
- PlatformType.SERVER, ServerInfo.getInstance().getVersion());
+ new CheckForUpdates(checkForUpdatesButton,
+ PlatformType.SERVER, ServerInfo.getInstance().getVersion(), new UpdateHyperlinkOnClick() {
+ @Override
+ public void handle(ActionEvent actionEvent) {
+ hostServices.showDocument(getURL());
+ }
+ });
}
private HBox getUIInputBoxWithDirectoryChooser(String labelText, TextField textField)
@@ -321,7 +328,7 @@ public class GeneralSettings extends VBo
}
else
{
- StartAtBoot startAtBoot = new StartAtBoot(PlatformType.SERVER, ServerInfo.getInstance().getPlatformType());
+ StartAtBoot startAtBoot = new StartAtBoot(PlatformType.SERVER, ServerInfo.getInstance().getPlatform());
if(startOnBoot)
{
startAtBoot.create(new File(ServerInfo.getInstance().getRunnerFileName()));