From: rnayabed <debayansutradhar3@gmail.com>
Date: Tue, 23 Mar 2021 19:51:51 +0530
Subject: work
---
work
---


--- 'a/src/main/java/com/stream_pi/server/window/dashboard/DashboardBase.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/DashboardBase.java
@@ -105,8 +105,8 @@ public class DashboardBase extends Split
         }
         else
         {
-            getActionDetailsPane().setClient(clientConnection.getClient());
-            getActionGridPane().setClient(clientConnection.getClient());
+            getActionDetailsPane().setClientConnection(clientConnection);
+            getActionGridPane().setClientConnection(clientConnection);
         }
     }
 

--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java
@@ -447,15 +447,20 @@ public class ActionDetailsPane extends V
 
     private HBox displayTextFieldHBox;
 
-    private Client client;
+    private ClientConnection clientConnection;
     private ClientProfile clientProfile;
 
-    public void setClient(Client client) {
-        this.client = client;
+    public void setClientConnection(ClientConnection clientConnection) {
+        this.clientConnection = clientConnection;
     }
 
-    public Client getClient() {
-        return client;
+    public ClientConnection getClientConnection() {
+        return clientConnection;
+    }
+
+    public Client getClient()
+    {
+        return getClientConnection().getClient();
     }
 
     public void setClientProfile(ClientProfile clientProfile) {

--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java
@@ -196,6 +196,28 @@ public class OnSaveActionTask extends Ta
         {
             logger.info("Saving action ... "+action.isHasIcon()+"+"+sendIcon);
 
+
+
+            if(runOnActionSavedFromServer)
+            {
+
+                for(Property property : action.getClientProperties().get())
+                {
+                    System.out.println("SSSSSDDD : "+property.getName());
+                    System.out.println("@@@@DDD : "+property.getRawValue());
+                }
+                try
+                {
+                    if(action instanceof ExternalPlugin)
+                        ((ExternalPlugin) action).onActionSavedFromServer();
+                }
+                catch (Exception e)
+                {
+                    e.printStackTrace();
+                    exceptionAndAlertHandler.handleMinorException(new MinorException("Error","onActionSavedFromServer() failed for "+action.getModuleName()+"\n\n"+e.getMessage()));
+                }
+            }
+
             connection.saveActionDetails(clientProfile.getID(), action);
 
             if(sendIcon)
@@ -218,26 +240,6 @@ public class OnSaveActionTask extends Ta
             //clientProfile.removeActionByID(action.getID());
             //clientProfile.addAction(action);
 
-
-            if(runOnActionSavedFromServer)
-            {
-
-                for(Property property : action.getClientProperties().get())
-                {
-                    System.out.println("SSSSSDDD : "+property.getName());
-                    System.out.println("@@@@DDD : "+property.getRawValue());
-                }
-                try
-                {
-                    if(action instanceof ExternalPlugin)
-                        ((ExternalPlugin) action).onActionSavedFromServer();
-                }
-                catch (Exception e)
-                {
-                    e.printStackTrace();
-                    exceptionAndAlertHandler.handleMinorException(new MinorException("Error","onActionSavedFromServer() failed for "+action.getModuleName()+"\n\n"+e.getMessage()));
-                }
-            }
         }
         catch (SevereException e)
         {

--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java
@@ -149,6 +149,7 @@ public class ActionBox extends StackPane
 
                         newAction.setProfileID(actionGridPaneListener.getCurrentProfile().getID());
                         newAction.setParent(actionGridPaneListener.getCurrentParent());
+                        newAction.setSocketAddressForClient(actionGridPaneListener.getClientConnection().getRemoteSocketAddress());
 
                         try
                         {
@@ -185,6 +186,7 @@ public class ActionBox extends StackPane
                         newAction.setParent(actionGridPaneListener.getCurrentParent());
 
                         newAction.setProfileID(actionGridPaneListener.getCurrentProfile().getID());
+                        newAction.setSocketAddressForClient(actionGridPaneListener.getClientConnection().getRemoteSocketAddress());
 
                         actionGridPaneListener.addActionToCurrentClientProfile(newAction);
 

--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java
@@ -12,6 +12,7 @@ import com.stream_pi.action_api.otheract
 import com.stream_pi.server.action.ExternalPlugins;
 import com.stream_pi.server.client.Client;
 import com.stream_pi.server.client.ClientProfile;
+import com.stream_pi.server.connection.ClientConnection;
 import com.stream_pi.server.io.Config;
 import com.stream_pi.server.window.ExceptionAndAlertHandler;
 import com.stream_pi.server.window.dashboard.actiondetailpane.ActionDetailsPaneListener;
@@ -116,18 +117,25 @@ public class ActionGridPane extends Scro
         this.currentParent = currentParent;
     }
 
+    @Override
+    public ClientConnection getClientConnection() {
+        return clientConnection;
+    }
+
     public ClientProfile getClientProfile() {
         return clientProfile;
     }
 
-    private Client client;
+    private ClientConnection clientConnection;
 
-    public void setClient(Client client) {
-        this.client = client;
+
+    public void setClientConnection(ClientConnection clientConnection)
+    {
+        this.clientConnection = clientConnection;
     }
 
     public Client getClient() {
-        return client;
+        return getClientConnection().getClient();
     }
 
     private int rows, cols;

--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPaneListener.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPaneListener.java
@@ -5,6 +5,7 @@ import com.stream_pi.action_api.action.A
 import com.stream_pi.action_api.externalplugin.ExternalPlugin;
 import com.stream_pi.action_api.otheractions.FolderAction;
 import com.stream_pi.server.client.ClientProfile;
+import com.stream_pi.server.connection.ClientConnection;
 
 public interface ActionGridPaneListener
 {
@@ -18,6 +19,8 @@ public interface ActionGridPaneListener
 
     void setCurrentParent(String currentParent);
 
+    ClientConnection getClientConnection();
+
     ExternalPlugin createNewActionFromExternalPlugin(String module) throws Exception;
     Action createNewOtherAction(ActionType actionType) throws Exception;
 }