Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

server

Clone or download

minor bug fixes

Download Browse
+19 −7
Debayan Sutradhar (rnayabed) 2021-02-07 09:34
Debayan Sutradhar (rnayabed) 2021-02-07 09:34
c59ea42ad075a479823fcc819a28041daf982a87
0c9854e3199a78d199e632d17d2bdc1b579de12a
git #server/c59ea42ad075a479823fcc819a28041daf982a87

Modified Files

List
Side by side diff
M src/main/java/com/stream_pi/server/controller/Controller.java
+17 −5
--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -502,11 +502,23 @@ public class Controller extends Base imp
}
catch (Exception e)
{
- handleMinorException(new MinorException(
- "action Execution Failed!",
- "Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+
- "Check stacktrace/log to know what exactly happened\n\nMessage : \n"+e.getMessage() )
- );
+ //check if its windows UAC related
+ if(e.getMessage().contains("operation requires elevation"))
+ {
+ handleMinorException(new MinorException(
+ "Action Execution Failed!",
+ "Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+
+ "This action requires higher UAC privileges. Re-launch Stream-Pi Server with 'Administrator Privileges' in order to run this command.")
+ );
+ }
+ else
+ {
+ handleMinorException(new MinorException(
+ "Action Execution Failed!",
+ "Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+
+ "Check stacktrace/log to know what exactly happened\n\nMessage : \n"+e.getMessage() )
+ );
+ }
return false;
}
}
M src/main/java/com/stream_pi/server/window/firsttimeuse/LicensePane.java
+1 −1
--- 'a/src/main/java/com/stream_pi/server/window/firsttimeuse/LicensePane.java'
+++ b/src/main/java/com/stream_pi/server/window/firsttimeuse/LicensePane.java
@@ -12,7 +12,7 @@ public class LicensePane extends VBox {
{
getStyleClass().add("first_time_use_pane_license");
- Label label = new Label("By Clicking on 'Next', you agree with the license of StreamPi, and the license(s) of the library(s) used/included with this software.");
+ Label label = new Label("By clicking on 'Next' you agree with the Stream-Pi license, and, the license('s) of the library('s) used/included with this software.");
label.prefWidthProperty().bind(widthProperty());
label.setWrapText(true);
M src/main/java/com/stream_pi/server/window/firsttimeuse/WelcomePane.java
+1 −1
--- 'a/src/main/java/com/stream_pi/server/window/firsttimeuse/WelcomePane.java'
+++ b/src/main/java/com/stream_pi/server/window/firsttimeuse/WelcomePane.java
@@ -12,7 +12,7 @@ public class WelcomePane extends VBox{
Label welcomeLabel = new Label("Welcome!");
welcomeLabel.getStyleClass().add("first_time_use_welcome_pane_welcome_label");
- Label nextToContinue = new Label("Click on Next to continue with the setup.");
+ Label nextToContinue = new Label("Please click \"Next\" to start the Setup process");
nextToContinue.getStyleClass().add("first_time_use_welcome_pane_next_to_continue_label");