From: rnayabed <debayansutradhar3@gmail.com>
Date: Thu, 18 Mar 2021 23:14:17 +0530
Subject: Work on toggle actions
---
Work on toggle actions
---


--- 'a/src/main/java/com/stream_pi/server/action/ExternalPlugins.java'
+++ b/src/main/java/com/stream_pi/server/action/ExternalPlugins.java
@@ -269,7 +269,7 @@ public class ExternalPlugins
             logger.info("Loading plugins from jar ...");
             // Now you can use the new module layer to find service implementations in it
             externalPlugins = ServiceLoader
-                    .load(layer, NormalAction.class).stream()
+                    .load(layer, ExternalPlugin.class).stream()
                     .map(ServiceLoader.Provider::get)
                     .collect(Collectors.toList());
 
@@ -294,6 +294,8 @@ public class ExternalPlugins
                 eachPlugin.setServerConnection(serverConnection);
                 eachPlugin.initProperties();
 
+
+                logger.info("MODULE : "+eachPlugin.getModuleName());
                 Action foundAction = null;
                 for (Action action : pluginsConfigs) {
                     if (action.getModuleName().equals(eachPlugin.getModuleName())

--- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java'
+++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java
@@ -503,7 +503,7 @@ public class ClientConnection extends Th
 
         //action toBeAdded = null;
 
-        if(actionType == ActionType.NORMAL)
+        if(actionType == ActionType.NORMAL || actionType == ActionType.TOGGLE)
         {
             ExternalPlugin actionCopy = ExternalPlugins.getInstance().getPluginByModuleName(r[4]);
 

--- 'a/src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java
@@ -173,7 +173,7 @@ public class PluginsPane extends VBox {
     {
         Action newAction = new Action(action.getActionType());
 
-        if(action.getActionType() == ActionType.NORMAL)
+        if(action.getActionType() == ActionType.NORMAL || action.getActionType() == ActionType.TOGGLE)
         {
             newAction.setModuleName(action.getModuleName());
             newAction.setVersion(action.getVersion());

--- '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
@@ -133,7 +133,8 @@ public class OnSaveActionTask extends Ta
             {
                 if(isHideDefaultIcon)
                 {
-                    action.setCurrentIconState("default");
+                    if(action.getIcon("default") != null)
+                        action.setCurrentIconState("default");
                 }
                 else
                 {

--- 'a/src/main/java/module-info.java'
+++ b/src/main/java/module-info.java
@@ -1,6 +1,7 @@
 module com.stream_pi.server {
     uses com.stream_pi.action_api.action.Action;
     uses com.stream_pi.action_api.normalaction.NormalAction;
+    uses com.stream_pi.action_api.normalaction.ExternalPlugin;
 
     requires com.stream_pi.action_api;
     requires com.stream_pi.util;