server

Added delay before running for actions

Download Browse

+47 −6

Author

Debayan Sutradhar (rnayabed) 2021-03-09 19:52

Committer

Debayan Sutradhar (rnayabed) 2021-03-09 19:52

Hash d063dfd3a83ac747f51ad4bd0d3c83d1aa4624c2

Parent 30e8952e85d59cb5c7fea7023d974223786c2f57

Reference git #server/d063dfd3a83ac747f51ad4bd0d3c83d1aa4624c2

Modified Files

List

Side by side diff

Inline diff

M src/main/java/com/stream_pi/server/connection/ClientConnection.java

+13 −2

package com.stream_pi.server.connection;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.action_api.action.Location;

import com.stream_pi.action_api.actionproperty.ClientProperties;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.server.action.NormalActionPlugins;

import com.stream_pi.server.client.Client;

import com.stream_pi.server.client.ClientProfile;

import com.stream_pi.server.client.ClientTheme;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.server.window.ExceptionAndAlertHandler;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.comms.Message;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.exception.StreamPiException;

import com.stream_pi.util.platform.Platform;

import com.stream_pi.util.platform.ReleaseStatus;

import com.stream_pi.util.version.Version;

import javafx.concurrent.Task;

import java.io.*;

import java.lang.reflect.Array;

import java.net.Socket;

import java.util.ArrayList;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.logging.Level;

import java.util.logging.Logger;

public class ClientConnection extends Thread

{

private Socket socket;

private ServerListener serverListener;

private AtomicBoolean stop = new AtomicBoolean(false);

private ObjectOutputStream oos;

private ObjectInputStream ois;

private Logger logger;

private Client client = null;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

public ClientConnection(Socket socket, ServerListener serverListener, ExceptionAndAlertHandler exceptionAndAlertHandler)

{

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.socket = socket;

this.serverListener = serverListener;

logger = Logger.getLogger(ClientConnection.class.getName());

try

{

oos = new ObjectOutputStream(socket.getOutputStream());

ois = new ObjectInputStream(socket.getInputStream());

} catch (IOException e) {

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException("Unable to start socket streams"));

}

start();

}

public synchronized void exit()

{

if(stop.get())

return;

logger.info("Stopping ...");

try

{

if(socket !=null)

{

logger.info("Stopping connection "+socket.getRemoteSocketAddress());

disconnect();

}

catch (SevereException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

public synchronized void exitAndRemove()

{

exit();

removeConnection();

serverListener.clearTemp();

}

public void removeConnection()

{

ClientConnections.getInstance().removeConnection(this);

}

public void sendIcon(String profileID, String actionID, byte[] icon) throws SevereException

{

try

{

Thread.sleep(50);

}

catch (InterruptedException e)

{

e.printStackTrace();

}

Message message = new Message("action_icon");

message.setStringArrValue(profileID, actionID);

message.setByteArrValue(icon);

sendMessage(message);

}

public void initAfterConnectionQueryReceive(Message message) throws StreamPiException

{

String[] ar = message.getStringArrValue();

logger.info("Setting up client object ...");

Version clientVersion;

Version commsStandard;

Version themesStandard;

ReleaseStatus releaseStatus;

try

{

clientVersion = new Version(ar[0]);

releaseStatus = ReleaseStatus.valueOf(ar[1]);

commsStandard = new Version(ar[2]);

themesStandard = new Version(ar[3]);

}

catch (MinorException e)

{

exitAndRemove();

throw new MinorException(e.getShortMessage()+" (client '"+socket.getRemoteSocketAddress()+"' )");

}

if(!commsStandard.isEqual(ServerInfo.getInstance().getCommStandardVersion()))

{

String errTxt = "Server and client Communication standards do not match. Make sure you are on the latest version of server and client.\n" +

"Server Comms. Standard : "+ServerInfo.getInstance().getCommStandardVersion().getText()+

"\nclient Comms. Standard : "+commsStandard.getText();

disconnect(errTxt);

throw new MinorException(errTxt);

}

client = new Client(clientVersion, releaseStatus, commsStandard, themesStandard, ar[4], Platform.valueOf(ar[7]), socket.getRemoteSocketAddress());

client.setStartupDisplayWidth(Double.parseDouble(ar[5]));

client.setStartupDisplayHeight(Double.parseDouble(ar[6]));

client.setDefaultProfileID(ar[8]);

client.setDefaultThemeFullName(ar[9]);

//call get profiles command.

serverListener.clearTemp();

}

public synchronized Client getClient()

{

return client;

}

@Override

public void run() {

try {

initAfterConnectionQuerySend();

} catch (SevereException e) {

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

exitAndRemove();

return;

}

try

{

while(!stop.get())

{

try

{

Message message = (Message) ois.readObject();

String header = message.getHeader();

switch (header)

{

case "action_icon" : onActionIconReceived(message);

break;

case "disconnect" : clientDisconnected(message);

break;

case "client_details" : initAfterConnectionQueryReceive(message);

getProfilesFromClient();

getThemesFromClient();

break;

case "profiles" : registerProfilesFromClient(message);

break;

case "profile_details" : registerProfileDetailsFromClient(message);

break;

case "action_details" : registerActionToProfile(message);

break;

case "themes": registerThemes(message);

break;

case "action_clicked": actionClicked(message);

break;

default: logger.warning("Command '"+header+"' does not match records. Make sure client and server versions are equal.");

}

catch (IOException | ClassNotFoundException e)

{

logger.log(Level.SEVERE, e.getMessage());

e.printStackTrace();

serverListener.clearTemp();

if(!stop.get())

{

removeConnection();

throw new MinorException("Accidentally disconnected from "+getClient().getNickName()+".");

}

exitAndRemove();

return;

}

catch (StreamPiException e)

{

e.printStackTrace();

if(e instanceof MinorException)

exceptionAndAlertHandler.handleMinorException((MinorException) e);

else if (e instanceof SevereException)

exceptionAndAlertHandler.handleSevereException((SevereException) e);

}

// commands

private void onActionIconReceived(Message message)

{

String[] s = message.getStringArrValue();

String profileID = s[0];

String actionID = s[1];

getClient().getProfileByID(profileID).getActionByID(actionID).setIcon(message.getByteArrValue());

}

public void initAfterConnectionQuerySend() throws SevereException

{

logger.info("Asking client details ...");

sendMessage(new Message("get_client_details"));

}

public void disconnect() throws SevereException {

disconnect("");

}

public void disconnect(String message) throws SevereException {

if(stop.get())

return;

stop.set(true);

logger.info("Sending client disconnect message ...");

Message m = new Message("disconnect");

m.setStringValue(message);

sendMessage(m);

try

{

if(!socket.isClosed())

socket.close();

}

catch (IOException e)

{

e.printStackTrace();

throw new SevereException("Unable to close socket");

}

public synchronized void sendMessage(Message message) throws SevereException

{

try

{

oos.writeObject(message);

oos.flush();

}

catch (IOException e)

{

e.printStackTrace();

throw new SevereException("Unable to write to io Stream!");

}

public void clientDisconnected(Message message)

{

stop.set(true);

String txt = "Disconnected!";

String msg = message.getStringValue();

if(!msg.isBlank())

txt = "Message : "+msg;

new StreamPiAlert("Disconnected from "+getClient().getNickName()+".", txt, StreamPiAlertType.WARNING).show();;

exitAndRemove();

}

public void getProfilesFromClient() throws StreamPiException

{

logger.info("Asking client to send profiles ...");

sendMessage(new Message("get_profiles"));

}

public void getThemesFromClient() throws StreamPiException

{

logger.info("Asking clients to send themes ...");

sendMessage(new Message("get_themes"));

}

public void registerThemes(Message message)

{

String[] r = message.getStringArrValue();

for(int i =0; i<(r.length);i+=4)

{

ClientTheme clientTheme = new ClientTheme(

r[i],

r[i+1],

r[i+2],

r[i+3]

);

try

{

getClient().addTheme(clientTheme);

}

catch (CloneNotSupportedException e)

{

logger.log(Level.SEVERE, e.getMessage());

e.printStackTrace();

}

public void registerProfilesFromClient(Message message) throws StreamPiException

{

logger.info("Registering profiles ...");

String[] r = message.getStringArrValue();

for (String profileID : r) {

getProfileDetailsFromClient(profileID);

}

public void getProfileDetailsFromClient(String ID) throws StreamPiException

{

logger.info("Asking client to send details of profile : "+ID);

Message message = new Message("get_profile_details");

message.setStringValue(ID);

sendMessage(message);

}

public void registerProfileDetailsFromClient(Message message)

{

String[] r = message.getStringArrValue();

String ID = r[0];

logger.info("Registering details for profile : "+ID);

String name = r[1];

int rows = Integer.parseInt(r[2]);

int cols = Integer.parseInt(r[3]);

int actionSize = Integer.parseInt(r[4]);

int actionGap = Integer.parseInt(r[5]);

ClientProfile clientProfile = new ClientProfile(name, ID, rows, cols, actionSize, actionGap);

logger.info("Added client profile "+clientProfile.getName());

try

{

getClient().addProfile(clientProfile);

}

catch (CloneNotSupportedException e)

{

logger.severe(e.getMessage());

e.printStackTrace();

}

serverListener.clearTemp();

}

/*public void getActionIcon(String profileID, String actionID) throws StreamPiException

{

System.out.println("getting action icon from "+profileID+", "+actionID);

writeToStream("get_action_icon::"+profileID+"::"+actionID);

}*/

public synchronized void registerActionToProfile(Message message) throws StreamPiException

{

String[] r = message.getStringArrValue();

String profileID = r[0];

String ID = r[1];

ActionType actionType = ActionType.valueOf(r[2]);

//3 - Version

//4 - ModuleName

//display

String bgColorHex = r[5];

//icon

boolean isHasIcon = r[6].equals("true");

boolean isShowIcon = r[7].equals("true");

//text

boolean isShowDisplayText = r[8].equals("true");

String displayFontColor = r[9];

String displayText = r[10];

DisplayTextAlignment displayTextAlignment = DisplayTextAlignment.valueOf(r[11]);

//location

String row = r[12];

String col = r[13];

Location location = new Location(Integer.parseInt(row), Integer.parseInt(col));

Action action = new Action(ID, actionType);

action.setBgColourHex(bgColorHex);

action.setShowIcon(isShowIcon);

action.setHasIcon(isHasIcon);

action.setShowDisplayText(isShowDisplayText);

action.setDisplayTextFontColourHex(displayFontColor);

action.setDisplayText(displayText);

action.setDisplayTextAlignment(displayTextAlignment);

action.setLocation(location);

String root = r[14];

action.setParent(root);

action.setDelayBeforeExecuting(Integer.parseInt(r[15]));

//client properties

int clientPropertiesSize = Integer.parseInt(r[15]);

int clientPropertiesSize = Integer.parseInt(r[16]);

ClientProperties clientProperties = new ClientProperties();

if(actionType == ActionType.FOLDER)

clientProperties.setDuplicatePropertyAllowed(true);

for(int i = 16;i<((clientPropertiesSize*2) + 16); i+=2)

for(int i = 17;i<((clientPropertiesSize*2) + 17); i+=2)

{

Property property = new Property(r[i], Type.STRING);

property.setRawValue(r[i+1]);

clientProperties.addProperty(property);

}

action.setClientProperties(clientProperties);

action.setModuleName(r[4]);

//set up action

//action toBeAdded = null;

if(actionType == ActionType.NORMAL)

{

NormalAction actionCopy = NormalActionPlugins.getInstance().getPluginByModuleName(r[4]);

if(actionCopy == null)

{

action.setInvalid(true);

}

else

{

action.setVersion(new Version(r[3]));

//action.setHelpLink(actionCopy.getHelpLink());

if(actionCopy.getVersion().getMajor() != action.getVersion().getMajor())

{

action.setInvalid(true);

}

else

{

action.setName(actionCopy.getName());

ClientProperties finalClientProperties = new ClientProperties();

for(Property property : actionCopy.getClientProperties().get())

{

for(int i = 0;i<action.getClientProperties().getSize();i++)

{

Property property1 = action.getClientProperties().get().get(i);

if (property.getName().equals(property1.getName()))

{

property.setRawValue(property1.getRawValue());

finalClientProperties.addProperty(property);

}

action.setClientProperties(finalClientProperties);

}

try

{

for(Property prop : action.getClientProperties().get())

{

logger.info("G@@@@@ : "+prop.getRawValue());

}

getClient().getProfileByID(profileID).addAction(action);

for(String action1x : getClient().getProfileByID(profileID).getActionsKeySet())

{

Action action1 = getClient().getProfileByID(profileID).getActionByID(action1x);

logger.info("231cc : "+action1.getID());

for(Property prop : action1.getClientProperties().get())

{

logger.info("G@VVVV@@@ : "+prop.getRawValue());

}

catch (CloneNotSupportedException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException("action", "Unable to clone"));

}

public void saveActionDetails(String profileID, Action action) throws SevereException

{

ArrayList<String> a = new ArrayList<>();

a.add(profileID);

a.add(action.getID());

a.add(action.getActionType()+"");

if(action.getActionType() == ActionType.NORMAL)

{

a.add(action.getVersion().getText());

System.out.println("VERSION :sdd "+action.getVersion().getText());

}

else

{

a.add("no");

}

if(action.getActionType() == ActionType.NORMAL)

{

a.add(action.getModuleName());

}

else

{

a.add("nut");

}

//display

a.add(action.getBgColourHex());

//icon

a.add(action.isHasIcon()+"");

a.add(action.isShowIcon()+"");

//text

a.add(action.isShowDisplayText()+"");

a.add(action.getDisplayTextFontColourHex());

a.add(action.getDisplayText());

a.add(action.getDisplayTextAlignment()+"");

//location

if(action.getLocation() == null)

{

a.add("-1");

}

else

{

a.add(action.getLocation().getRow()+"");

a.add(action.getLocation().getCol()+"");

}

a.add(action.getParent());

a.add(action.getDelayBeforeExecuting()+"");

//client properties

ClientProperties clientProperties = action.getClientProperties();

a.add(clientProperties.getSize()+"");

for(Property property : clientProperties.get())

{

a.add(property.getName());

a.add(property.getRawValue());

}

Message message = new Message("save_action_details");

String[] x = new String[a.size()];

x = a.toArray(x);

message.setStringArrValue(x);

sendMessage(message);

}

public void deleteAction(String profileID, String actionID) throws SevereException

{

Message message = new Message("delete_action");

message.setStringArrValue(profileID, actionID);

sendMessage(message);

}

public void saveClientDetails(String clientNickname, String screenWidth, String screenHeight, String defaultProfileID,

String defaultThemeFullName) throws SevereException

{

Message message = new Message("save_client_details");

message.setStringArrValue(

clientNickname,

screenWidth,

screenHeight,

defaultProfileID,

defaultThemeFullName

);

sendMessage(message);

client.setNickName(clientNickname);

client.setStartupDisplayWidth(Double.parseDouble(screenWidth));

client.setStartupDisplayHeight(Double.parseDouble(screenHeight));

client.setDefaultProfileID(defaultProfileID);

client.setDefaultThemeFullName(defaultThemeFullName);

}

public void saveProfileDetails(ClientProfile clientProfile) throws SevereException, CloneNotSupportedException {

if(client.getProfileByID(clientProfile.getID()) !=null)

{

client.getProfileByID(clientProfile.getID()).setName(clientProfile.getName());

client.getProfileByID(clientProfile.getID()).setRows(clientProfile.getRows());

client.getProfileByID(clientProfile.getID()).setCols(clientProfile.getCols());

client.getProfileByID(clientProfile.getID()).setActionSize(clientProfile.getActionSize());

client.getProfileByID(clientProfile.getID()).setActionGap(clientProfile.getActionGap());

}

else

client.addProfile(clientProfile);

Message message = new Message("save_client_profile");

message.setStringArrValue(

clientProfile.getID(),

clientProfile.getName(),

clientProfile.getRows()+"",

clientProfile.getCols()+"",

clientProfile.getActionSize()+"",

clientProfile.getActionGap()+""

);

sendMessage(message);

}

public void deleteProfile(String ID) throws SevereException

{

Message message = new Message("delete_profile");

message.setStringValue(ID);

sendMessage(message);

}

public void actionClicked(Message message)

{

try

{

String[] r = message.getStringArrValue();

String profileID = r[0];

String actionID = r[1];

Action action = client.getProfileByID(profileID).getActionByID(actionID);

if(action.getActionType() == ActionType.NORMAL)

{

NormalAction original = NormalActionPlugins.getInstance().getPluginByModuleName(

action.getModuleName()

);

if(original == null)

{

throw new MinorException(

"The action isn't installed on the server."

);

}

NormalAction normalAction = original.clone();

normalAction.setLocation(action.getLocation());

normalAction.setDisplayText(action.getDisplayText());

normalAction.setID(actionID);

normalAction.setDelayBeforeExecuting(action.getDelayBeforeExecuting());

normalAction.setClientProperties(action.getClientProperties());

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try

{

System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@2 "+normalAction.getDelayBeforeExecuting());

Thread.sleep(normalAction.getDelayBeforeExecuting());

boolean result = serverListener.onNormalActionClicked(normalAction);

if(!result)

{

sendActionFailed(profileID, actionID);

}

catch (SevereException e)

{

exceptionAndAlertHandler.handleSevereException(e);

}

catch (Exception e)

{

e.printStackTrace();

}

return null;

}

}).start();

}

} catch (Exception e) {

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException(e.getMessage()));

}

public void sendActionFailed(String profileID, String actionID) throws SevereException {

logger.info("Sending failed status ...");

Message message = new Message("action_failed");

message.setStringArrValue(profileID, actionID);

sendMessage(message);

}

M src/main/java/com/stream_pi/server/controller/Controller.java

+1 −1

package com.stream_pi.server.controller;

import com.stream_pi.action_api.action.ServerConnection;

import com.stream_pi.action_api.action.PropertySaver;

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.server.Main;

import com.stream_pi.server.action.NormalActionPlugins;

import com.stream_pi.server.connection.ClientConnections;

import com.stream_pi.server.connection.MainServer;

import com.stream_pi.server.io.Config;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.server.window.Base;

import com.stream_pi.server.window.dashboard.DonatePopupContent;

import com.stream_pi.server.window.firsttimeuse.FirstTimeUse;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertListener;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.iohelper.IOHelper;

import javafx.animation.Interpolator;

import javafx.animation.KeyFrame;

import javafx.animation.KeyValue;

import javafx.animation.Timeline;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.event.EventHandler;

import javafx.scene.Node;

import javafx.scene.Scene;

import javafx.stage.Modality;

import javafx.stage.Stage;

import javafx.stage.WindowEvent;

import java.awt.SystemTray;

import javafx.util.Duration;

import java.awt.Toolkit;

import java.awt.TrayIcon;

import java.awt.PopupMenu;

import java.awt.MenuItem;

import java.io.File;

import java.net.Inet4Address;

import java.net.InetAddress;

import java.net.NetworkInterface;

import java.net.UnknownHostException;

import java.util.Enumeration;

import java.util.Random;

import java.util.logging.Level;

public class Controller extends Base implements PropertySaver, ServerConnection

{

MainServer mainServer;

public void setupDashWindow() throws SevereException

{

try

{

StringBuilder ips = new StringBuilder();

Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();

while(e.hasMoreElements())

{

NetworkInterface n = e.nextElement();

Enumeration<InetAddress> ee = n.getInetAddresses();

while (ee.hasMoreElements())

{

InetAddress i = ee.nextElement();

String hostAddress = i.getHostAddress();

if(i instanceof Inet4Address)

{

ips.append(hostAddress);

if(e.hasMoreElements())

ips.append(" / ");

}

getStage().setTitle("Stream-Pi Server - IP(s): "+ips.toString()+" | Port: "+ Config.getInstance().getPort()); //Sets title

getStage().setOnCloseRequest(this::onCloseRequest);

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

@Override

public void init()

{

try {

initBase();

setupDashWindow();

setupSettingsWindowsAnimations();

NormalActionPlugins.getInstance().setPropertySaver(this);

NormalActionPlugins.getInstance().setServerConnection(this);

getDashboardPane().getPluginsPane().getSettingsButton().setOnAction(event -> {

openSettingsTimeLine.play();

});

getSettingsPane().getCloseButton().setOnAction(event -> {

closeSettingsTimeLine.play();

});

getSettingsPane().getThemesSettings().setController(this);

mainServer = new MainServer(this, this);

if(getConfig().isFirstTimeUse())

{

Stage stage = new Stage();

Scene s = new Scene(new FirstTimeUse(this, this),

getConfig().getStartupWindowWidth(), getConfig().getStartupWindowHeight());

stage.setResizable(false);

stage.setScene(s);

stage.setTitle("Stream-Pi Server Setup");

stage.initModality(Modality.APPLICATION_MODAL);

stage.setOnCloseRequest(event->Platform.exit());

stage.show();

}

else

{

if(getConfig().isAllowDonatePopup())

{

if(new Random().nextInt(5) == 3)

new DonatePopupContent(getHostServices(), this).show();

}

othInit();

}

catch (SevereException e)

{

handleSevereException(e);

}

@Override

public void othInit()

{

try

{

if(ServerInfo.getInstance().isStartMinimised() && SystemTray.isSupported())

minimiseApp();

else

getStage().show();

}

catch(MinorException e)

{

handleMinorException(e);

}

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try

{

getSettingsPane().getGeneralSettings().loadDataFromConfig();

//themes

getSettingsPane().getThemesSettings().setThemes(getThemes());

getSettingsPane().getThemesSettings().setCurrentThemeFullName(getCurrentTheme().getFullName());

getSettingsPane().getThemesSettings().loadThemes();

//clients

getSettingsPane().getClientsSettings().loadData();

try

{

//Plugins

Platform.runLater(()->{

getDashboardPane().getPluginsPane().clearData();

getDashboardPane().getPluginsPane().loadOtherActions();

});

NormalActionPlugins.setPluginsLocation(getConfig().getPluginsPath());

NormalActionPlugins.getInstance().init();

Platform.runLater(()->getDashboardPane().getPluginsPane().loadData());

getSettingsPane().getPluginsSettings().loadPlugins();

}

catch (MinorException e)

{

getSettingsPane().getPluginsSettings().showPluginInitError();

handleMinorException(e);

}

//Server

mainServer.setPort(getConfig().getPort());

mainServer.start();

}

catch (SevereException e)

{

handleSevereException(e);

}

return null;

}

}).start();

}

private void setupSettingsWindowsAnimations()

{

Node settingsNode = getSettingsPane();

Node dashboardNode = getDashboardPane();

openSettingsTimeLine = new Timeline();

openSettingsTimeLine.setCycleCount(1);

openSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleXProperty(),

1.1D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleYProperty(),

1.1D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleZProperty(),

1.1D, Interpolator.EASE_IN)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

0.9D, Interpolator.LINEAR))

);

openSettingsTimeLine.setOnFinished(event1 -> {

settingsNode.toFront();

});

closeSettingsTimeLine = new Timeline();

closeSettingsTimeLine.setCycleCount(1);

closeSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.1D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.1D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.1D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

0.9D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

1.0D, Interpolator.LINEAR))

);

closeSettingsTimeLine.setOnFinished(event1 -> {

dashboardNode.toFront();

new Thread(new Task<Void>() {

@Override

protected Void call() {

try {

getSettingsPane().getClientsSettings().loadData();

getSettingsPane().getGeneralSettings().loadDataFromConfig();

getSettingsPane().getPluginsSettings().loadPlugins();

getSettingsPane().getThemesSettings().setThemes(getThemes());

getSettingsPane().getThemesSettings().setCurrentThemeFullName(getCurrentTheme().getFullName());

getSettingsPane().getThemesSettings().loadThemes();

getSettingsPane().setDefaultTabToGeneral();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

return null;

}

}).start();

});

}

private Timeline openSettingsTimeLine;

private Timeline closeSettingsTimeLine;

public Controller(){

mainServer = null;

}

public void onCloseRequest(WindowEvent event)

{

try

{

if(Config.getInstance().getMinimiseToSystemTrayOnClose() &&

SystemTray.isSupported())

{

minimiseApp();

event.consume();

return;

}

getConfig().setStartupWindowSize(

getWidth(),

getHeight()

);

getConfig().save();

onQuitApp();

NormalActionPlugins.getInstance().shutDownActions();

Platform.exit();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

finally

{

closeLogger();

}

public void onQuitApp()

{

if(mainServer!=null)

mainServer.stopListeningForConnections();

ClientConnections.getInstance().disconnectAll();

getLogger().info("Shutting down ...");

}

public void minimiseApp() throws MinorException

{

try

{

SystemTray systemTray = SystemTray.getSystemTray();

if(getTrayIcon() == null)

initIconTray(systemTray);

systemTray.add(getTrayIcon());

getStage().hide();

getStage().setOnShown(windowEvent -> {

systemTray.remove(getTrayIcon());

});

}

catch(Exception e)

{

throw new MinorException(e.getMessage());

}

public void initIconTray(SystemTray systemTray)

{

Platform.setImplicitExit(false);

PopupMenu popup = new PopupMenu();

MenuItem exitItem = new MenuItem("Exit");

exitItem.addActionListener(l->{

systemTray.remove(getTrayIcon());

onQuitApp();

Platform.exit();

});

popup.add(exitItem);

TrayIcon trayIcon = new TrayIcon(

Toolkit.getDefaultToolkit().getImage(Main.class.getResource("app_icon.png")),

"Stream-Pi Server",

popup

);

trayIcon.addActionListener(l-> Platform.runLater(()-> getStage().show()));

trayIcon.setImageAutoSize(true);

this.trayIcon = trayIcon;

}

private TrayIcon trayIcon = null;

public TrayIcon getTrayIcon()

{

return trayIcon;

}

@Override

public void handleMinorException(MinorException e)

{

getLogger().log(Level.SEVERE, e.getMessage(), e);

e.printStackTrace();

Platform.runLater(()-> new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.WARNING).show());

}

@Override

public void handleSevereException(SevereException e) {

getLogger().log(Level.SEVERE, e.getMessage(), e);

e.printStackTrace();

Platform.runLater(()->{

StreamPiAlert alert = new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.ERROR);

alert.setOnClicked(new StreamPiAlertListener()

{

@Override

public void onClick(String txt)

{

onQuitApp();

Platform.exit();

}

});

alert.show();

});

}

@Override

public boolean onNormalActionClicked(NormalAction action) {

public synchronized boolean onNormalActionClicked(NormalAction action) {

try{

getLogger().info("action "+action.getID()+" clicked!");

action.onActionClicked();

return true;

}

catch (Exception e)

{

//check if its windows UAC related

if(e.getMessage().contains("operation requires elevation"))

{

handleMinorException(new MinorException(

"Action Execution Failed!",

"Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+

"This action requires higher UAC privileges. Re-launch Stream-Pi Server with 'Administrator Privileges' in order to run this command.")

);

}

else

{

handleMinorException(new MinorException(

"Action Execution Failed!",

"Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+

"Check stacktrace/log to know what exactly happened\n\nMessage : \n"+e.getMessage() )

);

}

return false;

}

@Override

public void clearTemp() {

Platform.runLater(() -> {

getDashboardPane().getClientDetailsPane().refresh();

getDashboardPane().getActionGridPane().clear();

getDashboardPane().getActionGridPane().setFreshRender(true);

getDashboardPane().getActionDetailsPane().clear();

getSettingsPane().getClientsSettings().loadData();

});

}

@Override

public void saveServerProperties()

{

try

{

NormalActionPlugins.getInstance().saveServerSettings();

getSettingsPane().getPluginsSettings().loadPlugins();

} catch (MinorException e) {

e.printStackTrace();

handleMinorException(e);

}

@Override

public com.stream_pi.util.platform.Platform getPlatform() {

return ServerInfo.getInstance().getPlatform();

}

M src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java

+1 −2

package com.stream_pi.server.window.dashboard;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.action_api.otheractions.CombineAction;

import com.stream_pi.action_api.otheractions.FolderAction;

import com.stream_pi.server.action.NormalActionPlugins;

import com.stream_pi.util.uihelper.SpaceFiller;

import javafx.application.HostServices;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.CacheHint;

import javafx.scene.Node;

import javafx.scene.control.*;

import javafx.scene.image.ImageView;

import javafx.scene.input.ClipboardContent;

import javafx.scene.input.Dragboard;

import javafx.scene.input.TransferMode;

import javafx.scene.layout.*;

import org.kordamp.ikonli.javafx.FontIcon;

import java.util.ArrayList;

import java.util.HashMap;

public class PluginsPane extends VBox {

private Button settingsButton;

public PluginsPane(HostServices hostServices)

{

setMinWidth(250);

setMaxWidth(350);

getStyleClass().add("plugins_pane");

setPadding(new Insets(10));

this.hostServices = hostServices;

initUI();

}

private Accordion pluginsAccordion;

public void initUI()

{

pluginsAccordion = new Accordion();

pluginsAccordion.getStyleClass().add("plugins_pane_accordion");

pluginsAccordion.setCache(true);

settingsButton = new Button();

settingsButton.getStyleClass().add("plugins_pane_settings_button");

FontIcon cog = new FontIcon("fas-cog");

settingsButton.setGraphic(cog);

HBox settingsHBox = new HBox(settingsButton);

settingsHBox.getStyleClass().add("plugins_pane_settings_button_parent");

settingsHBox.setAlignment(Pos.CENTER_RIGHT);

Label pluginsLabel = new Label("Plugins");

pluginsLabel.getStyleClass().add("plugins_pane_top_label");

getChildren().addAll(pluginsLabel, pluginsAccordion, SpaceFiller.vertical(), settingsHBox);

}

public Button getSettingsButton()

{

return settingsButton;

}

public void clearData()

{

pluginsAccordion.getPanes().clear();

}

public void loadData()

{

HashMap<String, ArrayList<NormalAction>> sortedPlugins = NormalActionPlugins.getInstance().getSortedPlugins();

for(String eachCategory : sortedPlugins.keySet())

{

VBox vBox = new VBox();

vBox.getStyleClass().add("plugins_pane_each_plugin_box_parent");

TitledPane pane = new TitledPane(eachCategory, vBox);

pane.getStyleClass().add("plugins_pane_each_plugin_category_titled_pane");

for(NormalAction eachAction : sortedPlugins.get(eachCategory))

{

if(!eachAction.isVisibleInPluginsPane())

continue;

Button eachNormalActionPluginButton = new Button();

eachNormalActionPluginButton.getStyleClass().add("plugins_pane_each_plugin_button");

HBox.setHgrow(eachNormalActionPluginButton, Priority.ALWAYS);

eachNormalActionPluginButton.setMaxWidth(Double.MAX_VALUE);

eachNormalActionPluginButton.setAlignment(Pos.CENTER_LEFT);

Node graphic = eachAction.getServerButtonGraphic();

if(graphic == null)

{

FontIcon cogs = new FontIcon("fas-cogs");

cogs.getStyleClass().add("plugins_pane_each_plugin_button_icon");

eachNormalActionPluginButton.setGraphic(cogs);

}

else

{

if(graphic instanceof FontIcon)

{

FontIcon fi = (FontIcon) graphic;

fi.getStyleClass().add("plugins_pane_each_plugin_button_icon");

eachNormalActionPluginButton.setGraphic(fi);

}

else if(graphic instanceof ImageView)

{

ImageView iv = (ImageView) graphic;

iv.getStyleClass().add("plugins_pane_each_plugin_button_imageview");

iv.setPreserveRatio(false);

eachNormalActionPluginButton.setGraphic(iv);

}

eachNormalActionPluginButton.setText(eachAction.getName());

eachNormalActionPluginButton.setOnDragDetected(mouseEvent -> {

Dragboard db = eachNormalActionPluginButton.startDragAndDrop(TransferMode.ANY);

ClipboardContent content = new ClipboardContent();

content.put(Action.getDataFormat(), createFakeAction(eachAction, "Untitled action"));

db.setContent(content);

mouseEvent.consume();

});

HBox hBox = new HBox(eachNormalActionPluginButton);

hBox.getStyleClass().add("plugins_pane_each_plugin_box");

hBox.setAlignment(Pos.TOP_LEFT);

HBox.setHgrow(eachNormalActionPluginButton, Priority.ALWAYS);

if(eachAction.getHelpLink() != null) {

Button helpButton = new Button();

helpButton.getStyleClass().add("plugins_pane_each_plugin_button_help_icon");

FontIcon questionIcon = new FontIcon("fas-question");

questionIcon.getStyleClass().add("plugins_pane_each_plugin_button_help_button_icon");

helpButton.setGraphic(questionIcon);

helpButton.setOnAction(event -> hostServices.showDocument(eachAction.getHelpLink()));

hBox.getChildren().add(helpButton);

}

vBox.getChildren().add(hBox);

}

if(vBox.getChildren().size() > 0)

pluginsAccordion.getPanes().add(pane);

}

private HostServices hostServices;

public Action createFakeAction(Action action, String displayText)

{

Action newAction = new Action(action.getActionType());

if(action.getActionType() == ActionType.NORMAL)

{

newAction.setModuleName(action.getModuleName());

newAction.setVersion(action.getVersion());

newAction.setName(action.getName());

}

newAction.setClientProperties(action.getClientProperties());

for(Property property : newAction.getClientProperties().get())

{

if(property.getType() == Type.STRING || property.getType() == Type.INTEGER || property.getType() == Type.DOUBLE)

property.setRawValue(property.getDefaultRawValue());

}

// newAction.setLocation(location);

newAction.setIDRandom();

newAction.setShowDisplayText(true);

newAction.setDisplayText(displayText);

newAction.setDisplayTextAlignment(DisplayTextAlignment.CENTER);

newAction.setShowIcon(false);

newAction.setHasIcon(false);

//action.setParent(root);

newAction.setBgColourHex("");

newAction.setDisplayTextFontColourHex("");

return newAction;

}

public void loadOtherActions()

{

VBox vBox = new VBox();

vBox.getStyleClass().add("plugins_pane_each_plugin_box_parent");

Button folderActionButton = new Button("Folder");

folderActionButton.getStyleClass().add("plugins_pane_each_plugin_button");

folderActionButton.setMaxWidth(Double.MAX_VALUE);

folderActionButton.setAlignment(Pos.CENTER_LEFT);

FontIcon folder = new FontIcon("fas-folder");

folderActionButton.setGraphic(folder);

folderActionButton.setOnDragDetected(mouseEvent -> {

Dragboard db = folderActionButton.startDragAndDrop(TransferMode.ANY);

ClipboardContent content = new ClipboardContent();

content.put(Action.getDataFormat(), createFakeAction(new FolderAction(), "Untitled Folder"));

db.setContent(content);

mouseEvent.consume();

});

Button combineActionButton = new Button("Combine");

combineActionButton.getStyleClass().add("plugins_pane_each_plugin_button");

combineActionButton.setMaxWidth(Double.MAX_VALUE);

combineActionButton.setAlignment(Pos.CENTER_LEFT);

FontIcon list = new FontIcon("fas-list");

combineActionButton.setGraphic(list);

combineActionButton.setOnDragDetected(mouseEvent -> {

Dragboard db = combineActionButton.startDragAndDrop(TransferMode.ANY);

ClipboardContent content = new ClipboardContent();

content.put(Action.getDataFormat(), createFakeAction(new CombineAction(), "Untitled Combine"));

db.setContent(content);

mouseEvent.consume();

});

HBox.setHgrow(folderActionButton, Priority.ALWAYS);

HBox h1 = new HBox(folderActionButton);

h1.getStyleClass().add("plugins_pane_each_plugin_box");

HBox.setHgrow(combineActionButton, Priority.ALWAYS);

HBox h2 = new HBox(combineActionButton);

h2.getStyleClass().add("plugins_pane_each_plugin_box");

vBox.getChildren().addAll(h1, h2);

TitledPane pane = new TitledPane("StreamPi", vBox);

TitledPane pane = new TitledPane("Stream-Pi", vBox);

pane.getStyleClass().add("plugins_pane_each_plugin_category_titled_pane");

pluginsAccordion.getPanes().add(pane);

pluginsAccordion.setCache(true);

pluginsAccordion.setCacheHint(CacheHint.SPEED);

}

M src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java

+27 −0

package com.stream_pi.server.window.dashboard.actiondetailpane;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.action_api.action.Location;

import com.stream_pi.action_api.actionproperty.property.ControlType;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.action_api.otheractions.CombineAction;

import com.stream_pi.action_api.otheractions.FolderAction;

import com.stream_pi.server.uipropertybox.UIPropertyBox;

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.connection.ClientConnections;

import com.stream_pi.server.window.dashboard.actiongridpane.ActionBox;

import com.stream_pi.server.window.ExceptionAndAlertHandler;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.uihelper.HBoxInputBox;

import com.stream_pi.util.uihelper.HBoxInputBoxWithFileChooser;

import com.stream_pi.util.uihelper.SpaceFiller;

import javafx.application.HostServices;

import javafx.collections.FXCollections;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.Node;

import javafx.scene.control.*;

import javafx.scene.input.TransferMode;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.Region;

import javafx.scene.layout.VBox;

import javafx.scene.paint.Color;

import javafx.scene.paint.Paint;

import javafx.stage.FileChooser;

import javafx.stage.Window;

import javafx.util.Callback;

import org.kordamp.ikonli.javafx.FontIcon;

import java.io.File;

import java.nio.file.Files;

import java.util.ArrayList;

import java.util.logging.Logger;

public class ActionDetailsPane extends VBox implements ActionDetailsPaneListener {

private ScrollPane scrollPane;

private VBox vbox;

private VBox clientPropertiesVBox;

private Button saveButton;

private Button deleteButton;

private Button openFolderButton;

private HBox buttonBar;

private Label actionHeadingLabel;

private Logger logger;

private Button returnButtonForCombineActionChild;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private HostServices hostServices;

public ActionDetailsPane(ExceptionAndAlertHandler exceptionAndAlertHandler, HostServices hostServices) {

this.hostServices = hostServices;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

logger = Logger.getLogger(ActionDetailsPane.class.getName());

setSpacing(10.0);

clientPropertiesVBox = new VBox();

clientPropertiesVBox.setSpacing(10.0);

vbox = new VBox();

vbox.setPadding(new Insets(0, 25, 0, 5));

vbox.getStyleClass().add("action_details_pane_vbox");

vbox.setSpacing(10.0);

getStyleClass().add("action_details_pane");

scrollPane = new ScrollPane();

VBox.setMargin(scrollPane, new Insets(0, 0, 0, 10));

scrollPane.getStyleClass().add("action_details_pane_scroll_pane");

setMinHeight(210);

scrollPane.setContent(vbox);

vbox.prefWidthProperty().bind(scrollPane.widthProperty());

scrollPane.prefWidthProperty().bind(widthProperty());

VBox.setVgrow(scrollPane, Priority.ALWAYS);

scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);

openFolderButton = new Button("Open Folder");

FontIcon folderOpenIcon = new FontIcon("far-folder-open");

openFolderButton.setGraphic(folderOpenIcon);

openFolderButton.setOnAction(event -> onOpenFolderButtonClicked());

saveButton = new Button("Apply Changes");

FontIcon syncIcon = new FontIcon("fas-sync-alt");

saveButton.setGraphic(syncIcon);

saveButton.setOnAction(event -> onSaveButtonClicked());

deleteButton = new Button("Delete action");

deleteButton.getStyleClass().add("action_details_pane_delete_button");

FontIcon deleteIcon = new FontIcon("fas-trash");

deleteIcon.getStyleClass().add("action_details_pane_delete_button_icon");

deleteButton.setGraphic(deleteIcon);

deleteButton.setOnAction(event -> onDeleteButtonClicked());

returnButtonForCombineActionChild = new Button("Return");

returnButtonForCombineActionChild.setGraphic(new FontIcon("fas-caret-left"));

returnButtonForCombineActionChild.managedProperty().bind(returnButtonForCombineActionChild.visibleProperty());

returnButtonForCombineActionChild.setOnAction(event -> {

try {

logger.info("@@## : " + action.getParent());

onActionClicked(getClientProfile().getActionByID(action.getParent()), getActionBox());

} catch (MinorException e) {

e.printStackTrace();

}

});

buttonBar = new HBox(openFolderButton, returnButtonForCombineActionChild, saveButton, deleteButton);

buttonBar.getStyleClass().add("action_details_pane_button_bar");

buttonBar.setPadding(new Insets(10, 10, 10, 0));

buttonBar.setAlignment(Pos.CENTER_RIGHT);

buttonBar.setVisible(false);

buttonBar.setSpacing(10.0);

actionHeadingLabel = new Label();

actionHeadingLabel.getStyleClass().add("action_details_pane_heading_label");

HBox headingHBox = new HBox(actionHeadingLabel);

headingHBox.getStyleClass().add("action_details_pane_heading_box");

headingHBox.setPadding(new Insets(5, 10, 0, 10));

getChildren().addAll(headingHBox, scrollPane, buttonBar);

displayTextAlignmentComboBox = new ComboBox<>(FXCollections.observableArrayList(DisplayTextAlignment.TOP,

DisplayTextAlignment.CENTER, DisplayTextAlignment.BOTTOM));

displayTextAlignmentComboBox.managedProperty().bind(displayTextAlignmentComboBox.visibleProperty());

Callback<ListView<DisplayTextAlignment>, ListCell<DisplayTextAlignment>> displayTextAlignmentComboBoxFactory = new Callback<>() {

@Override

public ListCell<DisplayTextAlignment> call(ListView<DisplayTextAlignment> displayTextAlignment) {

return new ListCell<>() {

@Override

protected void updateItem(DisplayTextAlignment displayTextAlignment, boolean b) {

super.updateItem(displayTextAlignment, b);

if (displayTextAlignment != null) {

setText(displayTextAlignment.getUIName());

}

};

}

};

displayTextAlignmentComboBox.setCellFactory(displayTextAlignmentComboBoxFactory);

displayTextAlignmentComboBox.setButtonCell(displayTextAlignmentComboBoxFactory.call(null));

actionClientProperties = new ArrayList<>();

displayNameTextField = new TextField();

displayNameTextField.managedProperty().bind(displayNameTextField.visibleProperty());

iconFileTextField = new TextField();

iconFileTextField.managedProperty().bind(iconFileTextField.visibleProperty());

iconFileTextField.textProperty().addListener((observableValue, s, t1) -> {

try {

if (!s.equals(t1) && t1.length() > 0) {

byte[] iconFileByteArray = Files.readAllBytes(new File(t1).toPath());

hideIconCheckBox.setDisable(false);

hideIconCheckBox.setSelected(false);

clearIconButton.setDisable(false);

System.out.println("ABABABABABBABABBABABABCCCCCCCCCCCCCCCCCC");

action.setIcon(iconFileByteArray);

setSendIcon(true);

System.out.println(action.getIconAsByteArray().length);

}

} catch (Exception e) {

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(new MinorException(e.getMessage()));

}

});

clearIconButton = new Button("Clear Icon");

clearIconButton.managedProperty().bind(clearIconButton.visibleProperty());

clearIconButton.setOnAction(event -> {

hideIconCheckBox.setDisable(true);

hideIconCheckBox.setSelected(false);

clearIconButton.setDisable(true);

setSendIcon(false);

iconFileTextField.clear();

});

hideDisplayTextCheckBox = new CheckBox("Hide");

hideDisplayTextCheckBox.managedProperty().bind(hideDisplayTextCheckBox.visibleProperty());

hideIconCheckBox = new CheckBox("Hide");

hideIconCheckBox.managedProperty().bind(hideIconCheckBox.visibleProperty());

actionBackgroundColourPicker = new ColorPicker();

actionBackgroundColourPicker.managedProperty().bind(actionBackgroundColourPicker.visibleProperty());

displayTextColourPicker = new ColorPicker();

displayTextColourPicker.managedProperty().bind(displayTextColourPicker.visibleProperty());

actionBackgroundColourTransparentCheckBox = new CheckBox("Default");

actionBackgroundColourPicker.disableProperty()

.bind(actionBackgroundColourTransparentCheckBox.selectedProperty());

HBox.setMargin(actionBackgroundColourTransparentCheckBox, new Insets(0, 0, 0, 10));

displayTextColourDefaultCheckBox = new CheckBox("Default");

displayTextColourPicker.disableProperty()

.bind(displayTextColourDefaultCheckBox.selectedProperty());

HBox.setMargin(displayTextColourDefaultCheckBox, new Insets(0, 0, 0, 10));

Region r = new Region();

HBox.setHgrow(r, Priority.ALWAYS);

Region r1 = new Region();

HBox.setHgrow(r1, Priority.ALWAYS);

HBox displayTextColourHBox = new HBox(new Label("Display Text Colour"), r1, displayTextColourPicker,

displayTextColourDefaultCheckBox);

displayTextColourHBox.setAlignment(Pos.CENTER);

displayTextColourHBox.setSpacing(5.0);

HBox bgColourHBox = new HBox(new Label("Background Colour"), r, actionBackgroundColourPicker,

actionBackgroundColourTransparentCheckBox);

bgColourHBox.setAlignment(Pos.CENTER);

bgColourHBox.setSpacing(5.0);

HBox clearIconHBox = new HBox(clearIconButton);

clearIconHBox.setAlignment(Pos.CENTER_RIGHT);

displayTextFieldHBox = new HBoxInputBox("Display Name", displayNameTextField, hideDisplayTextCheckBox);

normalActionsPropsVBox = new VBox(displayTextColourHBox,

new HBox(new Label("Alignment"), SpaceFiller.horizontal(),

displayTextAlignmentComboBox),

new HBoxInputBoxWithFileChooser("Icon", iconFileTextField, hideIconCheckBox,

new FileChooser.ExtensionFilter("Images", "*.jpeg", "*.jpg", "*.png", "*.gif")),

clearIconHBox, bgColourHBox);

normalActionsPropsVBox.managedProperty().bind(normalActionsPropsVBox.visibleProperty());

normalActionsPropsVBox.setSpacing(10.0);

vbox.getChildren().addAll(displayTextFieldHBox, normalActionsPropsVBox, clientPropertiesVBox);

vbox.setVisible(false);

scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);

setOnDragOver(dragEvent -> {

if (dragEvent.getDragboard().hasContent(Action.getDataFormat()) && action != null) {

if (action.getActionType() == ActionType.COMBINE) {

dragEvent.acceptTransferModes(TransferMode.ANY);

dragEvent.consume();

}

});

setOnDragDropped(dragEvent -> {

try {

Action newAction = (Action) dragEvent.getDragboard().getContent(Action.getDataFormat());

if (newAction.getActionType() == ActionType.NORMAL) {

newAction.setLocation(new Location(-1, -1));

newAction.setParent(this.action.getID());

combineActionPropertiesPane.getCombineAction().addChild(newAction.getID());

addActionToCurrentClientProfile(newAction);

ClientConnection connection = ClientConnections.getInstance()

.getClientConnectionBySocketAddress(getClient().getRemoteSocketAddress());

connection.saveActionDetails(getClientProfile().getID(), newAction);

combineActionPropertiesPane.renderProps();

saveAction();

}

} catch (MinorException e) {

exceptionAndAlertHandler.handleMinorException(e);

e.printStackTrace();

} catch (SevereException e) {

exceptionAndAlertHandler.handleSevereException(e);

e.printStackTrace();

} catch (CloneNotSupportedException e) {

e.printStackTrace();

}

});

}

private VBox normalActionsPropsVBox;

private HBox displayTextFieldHBox;

private Client client;

private ClientProfile clientProfile;

public void setClient(Client client) {

this.client = client;

}

public Client getClient() {

return client;

}

public void setClientProfile(ClientProfile clientProfile) {

this.clientProfile = clientProfile;

}

public ClientProfile getClientProfile() {

return clientProfile;

}

public void setActionHeadingLabelText(String text) {

actionHeadingLabel.setText(text);

}

private Action action;

public Action getAction() {

return action;

}

private ActionBox actionBox;

public ActionBox getActionBox() {

return actionBox;

}

@Override

public void onActionClicked(Action action, ActionBox actionBox) throws MinorException {

this.action = action;

this.actionBox = actionBox;

logger.info("action Display text : "+action.getDisplayText());

clear();

renderActionProperties();

}

private TextField displayNameTextField;

private CheckBox hideDisplayTextCheckBox;

private CheckBox hideIconCheckBox;

private TextField iconFileTextField;

private Button clearIconButton;

private ColorPicker actionBackgroundColourPicker;

private ColorPicker displayTextColourPicker;

private CheckBox actionBackgroundColourTransparentCheckBox;

private CheckBox displayTextColourDefaultCheckBox;

private ComboBox<DisplayTextAlignment> displayTextAlignmentComboBox;

public void clear()

{

sendIcon = false;

actionClientProperties.clear();

displayNameTextField.clear();

iconFileTextField.clear();

clientPropertiesVBox.getChildren().clear();

vbox.setVisible(false);

scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);

buttonBar.setVisible(false);

setActionHeadingLabelText("");

actionBackgroundColourPicker.setValue(Color.WHITE);

displayTextColourPicker.setValue(Color.WHITE);

}

boolean isCombineChild = false;

public boolean isCombineChild() {

return isCombineChild;

}

public void renderActionProperties() throws MinorException

{

//Combine Child action

isCombineChild = action.getLocation().getCol() == -1;

displayNameTextField.setText(action.getDisplayText());

if(isCombineChild)

{

setReturnButtonForCombineActionChildVisible(true);

normalActionsPropsVBox.setVisible(false);

hideDisplayTextCheckBox.setSelected(false);

hideDisplayTextCheckBox.setVisible(false);

}

else

{

normalActionsPropsVBox.setVisible(true);

setReturnButtonForCombineActionChildVisible(false);

hideDisplayTextCheckBox.setVisible(true);

setFolderButtonVisible(action.getActionType().equals(ActionType.FOLDER));

displayTextAlignmentComboBox.getSelectionModel().select(action.getDisplayTextAlignment());

if(!action.getBgColourHex().isEmpty())

actionBackgroundColourPicker.setValue(Color.valueOf(action.getBgColourHex()));

else

actionBackgroundColourTransparentCheckBox.setSelected(true);

if(!action.getDisplayTextFontColourHex().isEmpty())

displayTextColourPicker.setValue(Color.valueOf(action.getDisplayTextFontColourHex()));

else

displayTextColourDefaultCheckBox.setSelected(true);

hideDisplayTextCheckBox.setSelected(!action.isShowDisplayText());

hideIconCheckBox.setDisable(!action.isHasIcon());

hideIconCheckBox.setSelected(!action.isShowIcon());

if(!action.isHasIcon())

{

hideIconCheckBox.setSelected(false);

}

clearIconButton.setDisable(!action.isHasIcon());

}

buttonBar.setVisible(true);

vbox.setVisible(true);

scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);

if(action.getActionType() == ActionType.NORMAL)

{

if(action.isInvalid())

setActionHeadingLabelText("Invalid action ("+action.getModuleName()+")");

else

setActionHeadingLabelText(action.getName());

}

else if(action.getActionType() == ActionType.COMBINE)

setActionHeadingLabelText("Combine action");

else if(action.getActionType() == ActionType.FOLDER)

setActionHeadingLabelText("Folder action");

if(!action.isInvalid())

{

if(action.getActionType() == ActionType.NORMAL)

renderClientProperties();

else if(action.getActionType() == ActionType.COMBINE)

renderCombineActionProperties();

}

private CombineActionPropertiesPane combineActionPropertiesPane;

public CombineActionPropertiesPane getCombineActionPropertiesPane() {

return combineActionPropertiesPane;

}

public void setReturnButtonForCombineActionChildVisible(boolean visible)

{

returnButtonForCombineActionChild.setVisible(visible);

}

public void renderCombineActionProperties()

{

try

{

combineActionPropertiesPane = new CombineActionPropertiesPane(getActionAsCombineAction(action),

getClientProfile(),

this

);

clientPropertiesVBox.getChildren().add(combineActionPropertiesPane);

}

catch (MinorException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(e);

}

public void setAction(Action action) {

this.action = action;

}

public FolderAction getActionAsFolderAction(Action action)

{

FolderAction folderAction = new FolderAction();

folderAction.setDisplayText(action.getDisplayText());

folderAction.setName(action.getName());

folderAction.setID(action.getID());

folderAction.setLocation(action.getLocation());

folderAction.setBgColourHex(action.getBgColourHex());

folderAction.setParent(action.getParent());

folderAction.getClientProperties().set(action.getClientProperties());

folderAction.setDisplayTextAlignment(action.getDisplayTextAlignment());

folderAction.setShowIcon(action.isShowIcon());

folderAction.setHasIcon(action.isHasIcon());

if(folderAction.isHasIcon())

folderAction.setIcon(action.getIconAsByteArray());

folderAction.setDisplayTextFontColourHex(action.getDisplayTextFontColourHex());

return folderAction;

}

public CombineAction getActionAsCombineAction(Action action)

{

CombineAction combineAction = new CombineAction();

combineAction.setDisplayText(action.getDisplayText());

combineAction.setName(action.getName());

combineAction.setID(action.getID());

combineAction.setLocation(action.getLocation());

combineAction.setBgColourHex(action.getBgColourHex());

combineAction.setParent(action.getParent());

combineAction.getClientProperties().set(action.getClientProperties());

combineAction.setDisplayTextAlignment(action.getDisplayTextAlignment());

combineAction.setShowIcon(action.isShowIcon());

combineAction.setHasIcon(action.isHasIcon());

if(combineAction.isHasIcon())

combineAction.setIcon(action.getIconAsByteArray());

combineAction.setDisplayTextFontColourHex(action.getDisplayTextFontColourHex());

for(Property prop : combineAction.getClientProperties().get())

{

System.out.println("PROP : "+prop.getName()+","+prop.getRawValue());

}

return combineAction;

}

@Override

public void onOpenFolderButtonClicked()

{

FolderAction folderAction = getActionAsFolderAction(action);

actionBox.getActionGridPaneListener().renderFolder(folderAction);

clear();

}

@Override

public Window getCurrentWindow() {

return getScene().getWindow();

}

private ArrayList<UIPropertyBox> actionClientProperties;

private TextField delayBeforeRunningTextField;

public void renderClientProperties() throws MinorException

{

delayBeforeRunningTextField = new TextField();

delayBeforeRunningTextField.setText(getAction().getDelayBeforeExecuting()+"");

clientPropertiesVBox.getChildren().add(

new HBoxInputBox("Delay before running (milli-seconds)", delayBeforeRunningTextField, 50)

);

for(int i =0;i< action.getClientProperties().getSize(); i++)

{

Property eachProperty = action.getClientProperties().get().get(i);

if(!eachProperty.isVisible())

continue;

Label label = new Label(eachProperty.getDisplayName());

HBox hBox = new HBox(label);

hBox.setSpacing(5.0);

hBox.setAlignment(Pos.CENTER_LEFT);

Node controlNode = null;

if(eachProperty.getHelpLink() != null)

{

Button helpButton = new Button();

FontIcon questionIcon = new FontIcon("fas-question");

helpButton.setGraphic(questionIcon);

helpButton.setOnAction(event -> {

hostServices.showDocument(eachProperty.getHelpLink());

});

hBox.getChildren().add(helpButton);

}

hBox.getChildren().add(SpaceFiller.horizontal());

if(eachProperty.getControlType() == ControlType.COMBO_BOX)

{

ComboBox<String> comboBox = new ComboBox<>();

comboBox.getItems().addAll(eachProperty.getListValue());

comboBox.getSelectionModel().select(eachProperty.getSelectedIndex());

controlNode = comboBox;

}

else if(eachProperty.getControlType() == ControlType.TEXT_FIELD)

{

TextField textField = new TextField(eachProperty.getRawValue());

controlNode= textField;

}

else if(eachProperty.getControlType() == ControlType.TOGGLE)

{

ToggleButton toggleButton = new ToggleButton();

toggleButton.setSelected(eachProperty.getBoolValue());

if(eachProperty.getBoolValue())

toggleButton.setText("ON");

else

toggleButton.setText("OFF");

toggleButton.selectedProperty().addListener((observableValue, aBoolean, t1) -> {

if(t1)

toggleButton.setText("ON");

else

toggleButton.setText("OFF");

});

controlNode = toggleButton;

}

else if(eachProperty.getControlType() == ControlType.SLIDER_DOUBLE)

{

Slider slider = new Slider();

slider.setValue(eachProperty.getDoubleValue());

slider.setMax(eachProperty.getMaxDoubleValue());

slider.setMin(eachProperty.getMinDoubleValue());

controlNode = slider;

}

else if(eachProperty.getControlType() == ControlType.SLIDER_INTEGER)

{

Slider slider = new Slider();

slider.setValue(eachProperty.getIntValue());

slider.setMax(eachProperty.getMaxIntValue());

slider.setMin(eachProperty.getMinIntValue());

slider.setBlockIncrement(1.0);

slider.setSnapToTicks(true);

controlNode = slider;

}

hBox.getChildren().add(controlNode);

UIPropertyBox clientProperty = new UIPropertyBox(i, eachProperty.getDisplayName(), controlNode,

eachProperty.getControlType(), eachProperty.getType(), eachProperty.isCanBeBlank());

actionClientProperties.add(clientProperty);

clientPropertiesVBox.getChildren().add(hBox);

}

public void onSaveButtonClicked()

{

try {

// saveButton.setDisable(true);

// deleteButton.setDisable(true);

validateForm();

saveAction();

}

catch (MinorException e)

{

exceptionAndAlertHandler.handleMinorException(e);

}

private boolean sendIcon = false;

@Override

public void setSendIcon(boolean sendIcon)

{

this.sendIcon = sendIcon;

}

public void addActionToCurrentClientProfile(Action newAction) throws CloneNotSupportedException {

getClientProfile().addAction(newAction);

}

@Override

public void saveAction(Action action, boolean runAsync)

{

new OnSaveActionTask(

ClientConnections.getInstance().getClientConnectionBySocketAddress(

getClient().getRemoteSocketAddress()

action,

delayBeforeRunningTextField.getText(),

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, true);

}

public void setFolderButtonVisible(boolean visible)

{

openFolderButton.setVisible(visible);

}

public void validateForm() throws MinorException

{

String displayNameStr = displayNameTextField.getText();

StringBuilder finalErrors = new StringBuilder();

if(displayNameStr.isBlank())

{

finalErrors.append(" * Display Name cannot be blank\n");

}

if(!isCombineChild())

{

if(action.isHasIcon())

{

if(hideDisplayTextCheckBox.isSelected() && hideIconCheckBox.isSelected())

finalErrors.append(" * Both Icon and display text check box cannot be hidden.\n");

}

else

{

if(hideDisplayTextCheckBox.isSelected())

finalErrors.append(" * Display Text cannot be hidden, since there is also no icon.\n");

}

if(action.getActionType() == ActionType.NORMAL)

{

try

{

int n = Integer.parseInt(delayBeforeRunningTextField.getText());

if (n<0)

{

finalErrors.append(" * Sleep should be greater than 0.\n");

}

catch (Exception e)

{

finalErrors.append(" * Sleep should be a number.\n");

}

for (UIPropertyBox clientProperty : actionClientProperties) {

Node controlNode = clientProperty.getControlNode();

if (clientProperty.getControlType() == ControlType.TEXT_FIELD)

{

String value = ((TextField) controlNode).getText();

if(clientProperty.getType() == Type.INTEGER)

{

try

{

Integer.parseInt(value);

}

catch (NumberFormatException e)

{

finalErrors.append(" -> ").append(clientProperty.getDisplayName()).append(" must be integer.\n");

}

else

{

if(value.isBlank() && !clientProperty.isCanBeBlank())

finalErrors.append(" -> ").append(clientProperty.getDisplayName()).append(" cannot be blank.\n");

}

if(!finalErrors.toString().isEmpty())

{

throw new MinorException("You made mistakes",

finalErrors.toString());

}

public void onDeleteButtonClicked()

{

new OnDeleteActionTask(

ClientConnections.getInstance().getClientConnectionBySocketAddress(

getClient().getRemoteSocketAddress()

action,

isCombineChild(),

getCombineActionPropertiesPane(),

clientProfile, actionBox, this, exceptionAndAlertHandler,

!isCombineChild

);

}

M src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java

+5 −1

package com.stream_pi.server.window.dashboard.actiondetailpane;

import java.util.ArrayList;

import java.util.List;

import java.util.logging.Logger;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.action_api.actionproperty.ClientProperties;

import com.stream_pi.action_api.actionproperty.property.Property;

import com.stream_pi.action_api.actionproperty.property.Type;

import com.stream_pi.server.client.ClientProfile;

import com.stream_pi.server.connection.ClientConnection;

import com.stream_pi.server.uipropertybox.UIPropertyBox;

import com.stream_pi.server.window.ExceptionAndAlertHandler;

import com.stream_pi.server.window.dashboard.actiongridpane.ActionBox;

import com.stream_pi.util.exception.SevereException;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.scene.control.Button;

public class OnSaveActionTask extends Task<Void>

{

private Logger logger;

public OnSaveActionTask(ClientConnection connection, Action action, String displayNameText, boolean isCombineChild,

public OnSaveActionTask(ClientConnection connection, Action action, String delayBeforeRunningString, 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,

boolean runAsync)

{

this.saveButton = saveButton;

this.deleteButton = deleteButton;

this.delayBeforeRunningString = delayBeforeRunningString;

this.connection = connection;

this.action = action;

this.displayNameText = displayNameText;

this.isCombineChild = isCombineChild;

this.isShowDisplayText = isShowDisplayText;

this.isDefaultDisplayTextColour = isDefaultDisplayTextColour;

this.displayTextFontColour = displayTextFontColour;

this.isClearIcon = isClearIcon;

this.isHideIcon = isHideIcon;

this.displayTextAlignment = displayTextAlignment;

this.isTransparentBackground = isTransparentBackground;

this.combineActionPropertiesPane = combineActionPropertiesPane;

this.clientProfile = clientProfile;

this.sendIcon = sendIcon;

this.actionBox = actionBox;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.backgroundColour = backgroundColour;

this.actionClientProperties = actionClientProperties;

logger = Logger.getLogger(getClass().getName());

if(runAsync)

new Thread(this).start();

else

runTask();

}

private Button saveButton;

private Button deleteButton;

private String delayBeforeRunningString;

private boolean isShowDisplayText;

private boolean isCombineChild;

private String displayNameText;

private boolean isDefaultDisplayTextColour;

private ArrayList<UIPropertyBox> actionClientProperties;

private String displayTextFontColour;

private boolean isClearIcon;

private boolean isHideIcon;

private DisplayTextAlignment displayTextAlignment;

private boolean isTransparentBackground;

private String backgroundColour;

private CombineActionPropertiesPane combineActionPropertiesPane;

private ClientProfile clientProfile;

private boolean sendIcon;

private ActionBox actionBox;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private Action action;

private ClientConnection connection;

private void setSaveDeleteButtonState(boolean state)

{

Platform.runLater(()->{

saveButton.setDisable(state);

deleteButton.setDisable(state);

});

}

private void runTask()

{

action.setDisplayText(displayNameText);

if(!isCombineChild)

{

setSaveDeleteButtonState(true);

action.setShowDisplayText(isShowDisplayText);

if(isDefaultDisplayTextColour)

action.setDisplayTextFontColourHex("");

else

{

action.setDisplayTextFontColourHex(displayTextFontColour);

//String fontColour = "#" + displayTextColourPicker.getValue().toString().substring(2);

//action.setDisplayTextFontColourHex(fontColour);

}

if(isClearIcon)

{

action.setIcon(null);

action.setHasIcon(false);

action.setShowIcon(false);

}

if(action.isHasIcon())

action.setShowIcon(isHideIcon);

action.setDisplayTextAlignment(displayTextAlignment);

logger.info("BBBGGG : "+backgroundColour);

if(isTransparentBackground)

action.setBgColourHex("");

else

{

//String bgColour = "#" + actionBackgroundColourPicker.getValue().toString().substring(2);

action.setBgColourHex(backgroundColour);

}

System.out.println("parent : "+action.getParent());

if(action.getActionType() == ActionType.COMBINE)

{

List<String> finalChildren = combineActionPropertiesPane.getFinalChildren();

System.out.println("2334 "+finalChildren.size());

ClientProperties clientProperties = new ClientProperties();

for(int i = 0;i<finalChildren.size();i++)

{

Property property = new Property(i+"", Type.STRING);

property.setRawValue(finalChildren.get(i));

clientProperties.addProperty(property);

}

action.getClientProperties().set(clientProperties);

}

else

{

action.setDelayBeforeExecuting(Integer.parseInt(delayBeforeRunningString));

//properties

for (UIPropertyBox clientProperty : actionClientProperties) {

action.getClientProperties().get().get(clientProperty.getIndex()).setRawValue(clientProperty.getRawValue());

}

try

{

logger.info("Saving action ... "+action.isHasIcon()+"+"+sendIcon);

/*if(action.isHasIcon())

{

if(clientProfile.getActionByID(action.getID()).getIconAsByteArray() == null)

{

sendIcon = true;

}

else

{

if(!Arrays.equals(action.getIconAsByteArray(), clientProfile.getActionByID(action.getID()).getIconAsByteArray()))

{

logger.info("Sending ...");

sendIcon = true;

}

}*/

connection.saveActionDetails(clientProfile.getID(), action);

if(sendIcon)

{

connection.sendIcon(clientProfile.getID(), action.getID(), action.getIconAsByteArray());

}

if(!isCombineChild)

{

Platform.runLater(()->{

actionBox.clear();

actionBox.setAction(action);

//actionBox.baseInit();

actionBox.init();

});

setSaveDeleteButtonState(false);

}

clientProfile.removeActionByID(action.getID());

clientProfile.addAction(action);

}

catch (SevereException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

catch (CloneNotSupportedException e)

{

e.printStackTrace();

}

@Override

protected Void call() throws Exception

{

runTask();

return null;

}

Public

server

Clone or download

Added delay before running for actions

Modified Files