client
Clone or download
Modified Files
--- 'a/src/main/java/com/stream_pi/client/connection/Client.java'
+++ b/src/main/java/com/stream_pi/client/connection/Client.java
@@ -740,11 +740,11 @@ public class Client extends Thread{
Config.getInstance().setCurrentThemeFullName(sep[4]);
if(!oldHeight.equals(sep[2]) || !oldWidth.equals(sep[1]) || !oldThemeFullName.equals(sep[4]))
- javafx.application.Platform.runLater(clientListener::init);
+ Platform.runLater(clientListener::init);
Config.getInstance().save();
- javafx.application.Platform.runLater(clientListener::loadSettings);
+ Platform.runLater(clientListener::loadSettings);
}
catch (SevereException e)
{
@@ -776,7 +776,7 @@ public class Client extends Thread{
clientListener.getClientProfiles().addProfile(clientProfile);
clientProfile.saveProfileDetails();
clientListener.refreshGridIfCurrentProfile(sep[0]);
- javafx.application.Platform.runLater(clientListener::loadSettings);
+ Platform.runLater(clientListener::loadSettings);
}
catch (Exception e)
{
@@ -790,6 +790,11 @@ public class Client extends Thread{
clientListener.getClientProfiles().deleteProfile(clientListener.getClientProfiles().getProfileFromID(
message.getStringValue()
));
+
+ if(clientListener.getCurrentProfile().getID().equals(message.getStringValue()))
+ {
+ Platform.runLater(clientListener::renderRootDefaultProfile);
+ }
}
public void onActionClicked(String profileID, String actionID) throws SevereException
--- 'a/src/main/java/com/stream_pi/client/connection/ClientListener.java'
+++ b/src/main/java/com/stream_pi/client/connection/ClientListener.java
@@ -18,7 +18,7 @@ public interface ClientListener
Themes getThemes();
String getDefaultThemeFullName();
- void renderRootDefaultProfile() throws SevereException;
+ void renderRootDefaultProfile();
void setConnected(boolean isConnected);
boolean isConnected();
--- 'a/src/main/java/com/stream_pi/client/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/client/controller/Controller.java
@@ -312,13 +312,9 @@ public class Controller extends Base
}
@Override
- public void renderProfile(ClientProfile clientProfile, boolean freshRender) {
- try {
- getDashboardPane().renderProfile(clientProfile, freshRender);
- } catch (SevereException e) {
- e.printStackTrace();
- handleSevereException(e);
- }
+ public void renderProfile(ClientProfile clientProfile, boolean freshRender)
+ {
+ getDashboardPane().renderProfile(clientProfile, freshRender);
}
@Override
@@ -354,20 +350,9 @@ public class Controller extends Base
@Override
public void refreshGridIfCurrentProfile(String profileID) {
- ClientProfile clientProfile = getDashboardPane().getActionGridPane().getClientProfile();
-
- getDashboardPane().getActionGridPane().setFreshRender(true);
-
- if(clientProfile.getID().equals(profileID))
+ if(getCurrentProfile().getID().equals(profileID))
{
- Platform.runLater(()->{
- try {
- getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID), true);
- } catch (SevereException e) {
- e.printStackTrace();
- handleSevereException(e);
- }
- });
+ Platform.runLater(()-> getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID), true));
}
}
--- 'a/src/main/java/com/stream_pi/client/window/Base.java'
+++ b/src/main/java/com/stream_pi/client/window/Base.java
@@ -257,10 +257,10 @@ public abstract class Base extends Stack
return dashboardBase;
}
- public void renderRootDefaultProfile() throws SevereException
+ public void renderRootDefaultProfile()
{
getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(
- Config.getInstance().getStartupProfileID()
+ getConfig().getStartupProfileID()
), true);
}
--- 'a/src/main/java/com/stream_pi/client/window/dashboard/DashboardBase.java'
+++ b/src/main/java/com/stream_pi/client/window/dashboard/DashboardBase.java
@@ -44,12 +44,12 @@ public class DashboardBase extends VBox
getStyleClass().add("dashboard");
}
- public void renderProfile(ClientProfile clientProfile, boolean freshRender) throws SevereException
+ public void renderProfile(ClientProfile clientProfile, boolean freshRender)
{
renderProfile(clientProfile, "root", freshRender);
}
- public void renderProfile(ClientProfile clientProfile, String currentParent, boolean freshRender) throws SevereException
+ public void renderProfile(ClientProfile clientProfile, String currentParent, boolean freshRender)
{
actionGridPane.setClientProfile(clientProfile);
actionGridPane.setCurrentParent(currentParent);
--- 'a/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java'
+++ b/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java
@@ -120,7 +120,7 @@ public class ActionGridPane extends Grid
return currentParent;
}
- public StackPane getFolderBackButton() throws SevereException
+ public StackPane getFolderBackButton()
{
StackPane stackPane = new StackPane();
stackPane.getStyleClass().add("action_box");
@@ -145,7 +145,7 @@ public class ActionGridPane extends Grid
private boolean isFreshRender = true;
private Node folderBackButton = null;
- public void renderGrid() throws SevereException
+ public void renderGrid()
{
setHgap(getClientProfile().getActionGap());
setVgap(getClientProfile().getActionGap());
@@ -350,12 +350,8 @@ public class ActionGridPane extends Grid
public void renderFolder(String actionID) {
setCurrentParent(clientProfile.getActionFromID(actionID).getID());
setPreviousParent(clientProfile.getActionFromID(actionID).getParent());
- try {
- renderGrid();
- renderActions();
- } catch (SevereException e) {
- e.printStackTrace();
- }
+ renderGrid();
+ renderActions();
}
@Override
@@ -405,11 +401,7 @@ public class ActionGridPane extends Grid
).getParent());
}
- try {
- renderGrid();
- renderActions();
- } catch (SevereException e) {
- e.printStackTrace();
- }
+ renderGrid();
+ renderActions();
}
}