From: rnayabed <debayansutradhar3@gmail.com>
Date: Sun, 17 Jan 2021 12:10:44 +0530
Subject: work
---
work
---


Binary files /dev/null and b/BakPlugins/TextBlockAction-1.0.0.jar differ

--- 'a/src/main/java/com/StreamPi/Server/Controller/Controller.java'
+++ b/src/main/java/com/StreamPi/Server/Controller/Controller.java
@@ -487,7 +487,7 @@ public class Controller extends Base imp
     }
 
     @Override
-    public boolean onNormalActionClicked(NormalAction action) {
+    public synchronized boolean onNormalActionClicked(NormalAction action) {
         try{
             getLogger().info("Action "+action.getID()+" clicked!");
             

--- 'a/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/ActionDetailsPane.java'
+++ b/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/ActionDetailsPane.java
@@ -179,6 +179,7 @@ public class ActionDetailsPane extends V
                     System.out.println("ABABABABABBABABBABABABCCCCCCCCCCCCCCCCCC");
 
                     action.setIcon(iconFileByteArray);
+                    setSendIcon(true);
 
                     System.out.println(action.getIconAsByteArray().length);
                 }
@@ -350,10 +351,13 @@ public class ActionDetailsPane extends V
         this.action = action;
         this.actionBox = actionBox;
 
+        System.out.println(action.getActionType());
+
+
         logger.info("Action Display text : "+action.getDisplayText());
         clear();
 
-        renderActionProperties(false);
+        renderActionProperties();
     }
 
     private TextField displayNameTextField;
@@ -389,12 +393,17 @@ public class ActionDetailsPane extends V
         return isCombineChild;
     }
 
-    public void renderActionProperties(boolean isCombineChild) throws MinorException
+    public void renderActionProperties() throws MinorException
     {
-        this.isCombineChild = isCombineChild;
-        displayNameTextField.setText(action.getDisplayText());
 
+        if(action.getLocation().getCol() == -1) //Combine Child action
+            isCombineChild = true;
+        else
+            isCombineChild = false;           
+
+        displayNameTextField.setText(action.getDisplayText());
 
+        System.out.println(action.getDisplayText()+"@@@@::::"+isCombineChild);
 
         if(isCombineChild)
         {
@@ -689,35 +698,33 @@ public class ActionDetailsPane extends V
     }
 
     @Override
-    public void saveAction(Action action)
+    public void saveAction(Action action, boolean runAsync)
     {
-        new Thread(
-            new OnSaveActionTask(
-                ClientConnections.getInstance().getClientConnectionBySocketAddress(
-                    getClient().getRemoteSocketAddress()
-                ),
-                action,
-                displayNameTextField.getText(),
-                isCombineChild(),
-                !hideDisplayTextCheckBox.isSelected(),
-                displayTextColourDefaultCheckBox.isSelected(), 
-                "#" + displayTextColourPicker.getValue().toString().substring(2),
-                clearIconButton.isDisable(),
-                !hideIconCheckBox.isSelected(),
-                displayTextAlignmentComboBox.getSelectionModel().getSelectedItem(),
-                actionBackgroundColourTransparentCheckBox.isSelected(),
-                "#" + actionBackgroundColourPicker.getValue().toString().substring(2),
-                getCombineActionPropertiesPane(), 
-                clientProfile, sendIcon, actionBox, actionClientProperties, exceptionAndAlertHandler,
-                saveButton, deleteButton
-            )
-        ).start();
+        new OnSaveActionTask(
+            ClientConnections.getInstance().getClientConnectionBySocketAddress(
+                getClient().getRemoteSocketAddress()
+            ),
+            action,
+            displayNameTextField.getText(),
+            isCombineChild(),
+            !hideDisplayTextCheckBox.isSelected(),
+            displayTextColourDefaultCheckBox.isSelected(), 
+            "#" + displayTextColourPicker.getValue().toString().substring(2),
+            clearIconButton.isDisable(),
+            !hideIconCheckBox.isSelected(),
+            displayTextAlignmentComboBox.getSelectionModel().getSelectedItem(),
+            actionBackgroundColourTransparentCheckBox.isSelected(),
+            "#" + actionBackgroundColourPicker.getValue().toString().substring(2),
+            getCombineActionPropertiesPane(), 
+            clientProfile, sendIcon, actionBox, actionClientProperties, exceptionAndAlertHandler,
+            saveButton, deleteButton, runAsync
+        );
     }
 
     @Override
     public void saveAction()
     {
-        saveAction(action);
+        saveAction(action, true);
     }
 
     public void setFolderButtonVisible(boolean visible)
@@ -789,16 +796,15 @@ public class ActionDetailsPane extends V
 
     public void onDeleteButtonClicked()
     {
-        new Thread( 
-            new OnDeleteActionTask(
-                ClientConnections.getInstance().getClientConnectionBySocketAddress(
-                    getClient().getRemoteSocketAddress()
-                ),
-                action,
-                isCombineChild(),
-                getCombineActionPropertiesPane(), 
-                clientProfile, actionBox, this, exceptionAndAlertHandler
-            ) 
-        ).start();
+        new OnDeleteActionTask(
+            ClientConnections.getInstance().getClientConnectionBySocketAddress(
+                getClient().getRemoteSocketAddress()
+            ),
+            action,
+            isCombineChild(),
+            getCombineActionPropertiesPane(), 
+            clientProfile, actionBox, this, exceptionAndAlertHandler,
+            !isCombineChild
+        );
     }
 }
\ No newline at end of file

--- 'a/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/ActionDetailsPaneListener.java'
+++ b/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/ActionDetailsPaneListener.java
@@ -13,7 +13,7 @@ public interface ActionDetailsPaneListen
 
     void saveAction();
 
-    void saveAction(Action action);
+    void saveAction(Action action, boolean runAsync);
 
     void clear();
 

--- 'a/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/CombineActionPropertiesPane.java'
+++ b/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/CombineActionPropertiesPane.java
@@ -108,7 +108,7 @@ public class CombineActionPropertiesPane
         actionDetailsPane.clear();
         actionDetailsPane.setAction(action);
         try {
-            actionDetailsPane.renderActionProperties(true);
+            actionDetailsPane.renderActionProperties();
         } catch (MinorException e) {
             e.printStackTrace();
         }

--- 'a/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/OnDeleteActionTask.java'
+++ b/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/OnDeleteActionTask.java
@@ -21,7 +21,7 @@ public class OnDeleteActionTask extends
     public OnDeleteActionTask(ClientConnection connection, Action action, boolean isCombineChild,
         CombineActionPropertiesPane combineActionPropertiesPane, ClientProfile clientProfile, ActionBox actionBox,
         ActionDetailsPane actionDetailsPane,
-        ExceptionAndAlertHandler exceptionAndAlertHandler)
+        ExceptionAndAlertHandler exceptionAndAlertHandler, boolean runAsync)
     {
         this.connection = connection;
         this.action = action;
@@ -33,6 +33,11 @@ public class OnDeleteActionTask extends
         this.exceptionAndAlertHandler = exceptionAndAlertHandler;
 
         logger = Logger.getLogger(getClass().getName());
+
+        if(runAsync)
+            new Thread(this).start();
+        else
+            runTask();
     }
 
     private ClientConnection connection;
@@ -63,12 +68,16 @@ public class OnDeleteActionTask extends
 
                 try {
 
+                    
+                    actionDetailsPane.saveAction(combineActionPropertiesPane.getCombineAction(), false);
+                    
+                    System.out.println(combineActionPropertiesPane.getCombineAction().getDisplayText()+"@#@#@#@#@#@#");
                     actionDetailsPane.onActionClicked(
                             combineActionPropertiesPane.getCombineAction(),
                             actionBox
                     );
 
-                    actionDetailsPane.saveAction(combineActionPropertiesPane.getCombineAction());
+
 
                 } catch (MinorException e) {
                     e.printStackTrace();

--- 'a/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/OnSaveActionTask.java'
+++ b/src/main/java/com/StreamPi/Server/Window/Dashboard/ActionsDetailPane/OnSaveActionTask.java
@@ -27,11 +27,13 @@ public class OnSaveActionTask extends Ta
 
     private Logger logger;
 
+
     public OnSaveActionTask(ClientConnection connection, Action action, String displayNameText, boolean isCombineChild,
         boolean isShowDisplayText, boolean isDefaultDisplayTextColour, String displayTextFontColour, boolean isClearIcon,
         boolean isHideIcon, DisplayTextAlignment displayTextAlignment, boolean isTransparentBackground, String backgroundColour,
         CombineActionPropertiesPane combineActionPropertiesPane, ClientProfile clientProfile, boolean sendIcon, ActionBox actionBox,
-        ArrayList<UIPropertyBox> actionClientProperties, ExceptionAndAlertHandler exceptionAndAlertHandler, Button saveButton, Button deleteButton)
+        ArrayList<UIPropertyBox> actionClientProperties, ExceptionAndAlertHandler exceptionAndAlertHandler, Button saveButton, Button deleteButton,
+        boolean runAsync)
     {
         this.saveButton = saveButton;
         this.deleteButton = deleteButton;
@@ -57,6 +59,12 @@ public class OnSaveActionTask extends Ta
 
 
         logger = Logger.getLogger(getClass().getName());
+
+
+        if(runAsync)
+            new Thread(this).start();
+        else
+            runTask();
     }
 
     private Button saveButton;
@@ -87,6 +95,8 @@ public class OnSaveActionTask extends Ta
             deleteButton.setDisable(state);
         });
     }
+
+    
     private void runTask()
     {
         action.setDisplayText(displayNameText);
@@ -164,7 +174,7 @@ public class OnSaveActionTask extends Ta
         {
             logger.info("Saving action ... "+action.isHasIcon()+"+"+sendIcon);
 
-            if(action.isHasIcon())
+            /*if(action.isHasIcon())
             {
                 if(clientProfile.getActionByID(action.getID()).getIconAsByteArray() == null)
                 {
@@ -178,7 +188,7 @@ public class OnSaveActionTask extends Ta
                        sendIcon = true;
                    }
                }
-            }
+            }*/
 
             connection.saveActionDetails(clientProfile.getID(), action);