Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

server

Clone or download

Work on toggle actions

Download Browse
+8 −4
Debayan Sutradhar (rnayabed) 2021-03-18 23:14
Debayan Sutradhar (rnayabed) 2021-03-18 23:14
a0f0dc2637bc03cf726e395658586e54919d80b3
2a722d38424ac4b4d899af1541623de8628b8132
git #server/a0f0dc2637bc03cf726e395658586e54919d80b3

Modified Files

List
Side by side diff
M src/main/java/com/stream_pi/server/action/ExternalPlugins.java
+3 −1
--- '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())
M src/main/java/com/stream_pi/server/connection/ClientConnection.java
+1 −1
--- '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]);
M src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java
+1 −1
--- '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());
M src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java
+2 −1
--- '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
{
M src/main/java/module-info.java
+1 −0
--- '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;