From: rnayabed <debayansutradhar3@gmail.com>
Date: Fri, 26 Feb 2021 16:02:37 +0530
Subject: work
---
work
---


--- 'a/src/main/java/com/stream_pi/client/connection/Client.java'
+++ b/src/main/java/com/stream_pi/client/connection/Client.java
@@ -699,22 +699,10 @@ public class Client extends Thread{
 
             if(acc.getLocation().getCol()!=-1)
             {
-                String currentParent = clientListener.getCurrentParent();
-                if(acc.getParent().equals(currentParent))
-                {
-                    clientListener.clearActionBox(acc.getLocation().getCol(), acc.getLocation().getRow());
-                }
-
-
-                Platform.runLater(()->{
-                    try
-                    {
-                        clientListener.renderRootDefaultProfile();
-                    }
-                    catch (SevereException e)
+                Platform.runLater(()-> {
+                    if (clientListener.getCurrentProfile().getID().equals(profileID))
                     {
-                        e.printStackTrace();
-                        exceptionAndAlertHandler.handleSevereException(e);
+                        clientListener.renderProfile(clientListener.getCurrentProfile(), false);
                     }
                 });
             }

--- 'a/src/main/java/com/stream_pi/client/connection/ClientListener.java'
+++ b/src/main/java/com/stream_pi/client/connection/ClientListener.java
@@ -23,7 +23,7 @@ public interface ClientListener
     void setConnected(boolean isConnected);
     boolean isConnected();
 
-    void renderProfile(ClientProfile clientProfile);
+    void renderProfile(ClientProfile clientProfile, boolean freshRender);
 
     void clearActionBox(int col, int row);
     void addBlankActionBox(int col, int row);

--- 'a/src/main/java/com/stream_pi/client/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/client/controller/Controller.java
@@ -312,9 +312,9 @@ public class Controller extends Base
     }
 
     @Override
-    public void renderProfile(ClientProfile clientProfile) {
+    public void renderProfile(ClientProfile clientProfile, boolean freshRender) {
         try {
-            getDashboardPane().renderProfile(clientProfile);
+            getDashboardPane().renderProfile(clientProfile, freshRender);
         } catch (SevereException e) {
             e.printStackTrace();
             handleSevereException(e);
@@ -339,7 +339,7 @@ public class Controller extends Base
         Platform.runLater(()->{
             try {
                 if(getDashboardPane().getActionGridPane().getCurrentParent().equals(action.getParent()) &&
-                        getDashboardPane().getActionGridPane().getClientProfile().getID().equals(currentProfileID))
+                        getCurrentProfile().getID().equals(currentProfileID))
                 {
                     getDashboardPane().getActionGridPane().renderAction(action);
                 }
@@ -362,7 +362,7 @@ public class Controller extends Base
         {
             Platform.runLater(()->{
                 try {
-                    getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID));
+                    getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID), true);
                 } catch (SevereException e) {
                     e.printStackTrace();
                     handleSevereException(e);

--- 'a/src/main/java/com/stream_pi/client/window/Base.java'
+++ b/src/main/java/com/stream_pi/client/window/Base.java
@@ -261,7 +261,7 @@ public abstract class Base extends Stack
     {
         getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(
                 Config.getInstance().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,15 +44,16 @@ public class DashboardBase extends VBox
         getStyleClass().add("dashboard");
     }
 
-    public void renderProfile(ClientProfile clientProfile) throws SevereException
+    public void renderProfile(ClientProfile clientProfile, boolean freshRender) throws SevereException
     {
-        renderProfile(clientProfile, "root");
+        renderProfile(clientProfile, "root", freshRender);
     }
 
-    public void renderProfile(ClientProfile clientProfile, String currentParent) throws SevereException
+    public void renderProfile(ClientProfile clientProfile, String currentParent, boolean freshRender) throws SevereException
     {
         actionGridPane.setClientProfile(clientProfile);
         actionGridPane.setCurrentParent(currentParent);
+        actionGridPane.setFreshRender(freshRender);
 
         actionGridPane.renderGrid();
         actionGridPane.renderActions();

--- '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
@@ -261,17 +261,6 @@ public class ActionGridPane extends Grid
     public ActionBox getActionBox(int col, int row)
     {
         return actionBoxes[col][row];
-
-        /*for(Node node : getChildren())
-        {
-            if(GridPane.getColumnIndex(node) == row &&
-                    GridPane.getRowIndex(node) == col)
-            {
-                return (ActionBox) node;
-            }
-        }
-
-        return null;*/
     }
 
     public ActionBox addBlankActionBox(int col, int row)

--- 'a/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java'
+++ b/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java
@@ -91,7 +91,7 @@ public class SettingsBase extends VBox {
             @Override
             public void onNewItemSelected(ClientProfile selectedItem) 
             {
-                clientListener.renderProfile(selectedItem);
+                clientListener.renderProfile(selectedItem, true);
             }
         });
 

Binary files 'a/src/main/resources/com/stream_pi/client/Default.obj' and b/src/main/resources/com/stream_pi/client/Default.obj differ