client

Refactored, removed old proto files

Download Browse

+36 −100

Author

Debayan Sutradhar (rnayabed) 2021-02-09 20:01

Committer

Debayan Sutradhar (rnayabed) 2021-02-09 20:01

Hash 0d39bb232652babafaff0fe5359255c8867730c6

Parent e023760afc1dd31f844d4ef005a5d36d9f59b1f5

Reference git #client/0d39bb232652babafaff0fe5359255c8867730c6

Modified Files

List

Side by side diff

Inline diff

M pom.xml

+1 −1

<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>com.stream-pi</groupId>

<artifactId>client</artifactId>

<version>1.0.0-SNAPSHOT</version>

<url>https://stream-pi.com/</url>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.release>11</maven.compiler.release>

<javafx.version>16-ea+6</javafx.version>

<client.plugin.version>0.1.36</client.plugin.version>

<ikonli.version>11.5.0</ikonli.version>

<action.api.version>1.0.0-SNAPSHOT</action.api.version>

<util.version>1.0.0-SNAPSHOT</util.version>

<theme.api.version>1.0.0-SNAPSHOT</theme.api.version>

<main.class.name>com.StreamPi.Client.Main</main.class.name>

</properties>

<groupId>org.openjfx</groupId>

<artifactId>javafx-controls</artifactId>

<version>${javafx.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-fontawesome5-pack</artifactId>

<version>${ikonli.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-javafx</artifactId>

<version>${ikonli.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>action-api</artifactId>

<version>${action.api.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>theme-api</artifactId>

<version>${theme.api.version}</version>

</dependency>

<groupId>com.stream_pi</groupId>

<groupId>com.stream-pi</groupId>

<version>${util.version}</version>

</dependency>

<groupId>com.gluonhq.attach</groupId>

<artifactId>lifecycle</artifactId>

</dependency>

<groupId>com.gluonhq.attach</groupId>

</dependency>

</dependencies>

<id>gluon-releases</id>

<url>http://nexus.gluonhq.com/nexus/content/repositories/releases/</url>

</repository>

</repositories>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-compiler-plugin</artifactId>

</plugin>

<groupId>org.openjfx</groupId>

<artifactId>javafx-maven-plugin</artifactId>

<mainClass>${main.class.name}</mainClass>

</configuration>

</plugin>

<groupId>com.gluonhq</groupId>

<artifactId>client-maven-plugin</artifactId>

<version>${client.plugin.version}</version>

<target>${clientTarget}</target>

<list>--initialize-at-build-time=com.sun.org.apache.xml.internal.serializer.ToXMLStream</list>

<list>${additionalArgs}</list>

</nativeImageArgs>

<list>com.sun.org.apache.xerces.internal.impl.msg.XMLMessages</list>

</bundlesList>

<list>lifecycle</list>

</attachList>

<list>java.util.logging.FileHandler</list>

</reflectionList>

<mainClass>${main.class.name}</mainClass>

</configuration>

</plugin>

<artifactId>maven-resources-plugin</artifactId>

</configuration>

</plugin>

</plugins>

</build>

<id>android</id>

<clientTarget>android</clientTarget>

<additionalArgs>-Dsvm.targetName=android</additionalArgs>

</properties>

</profile>

<clientTarget>linux-aarch64</clientTarget>

<additionalArgs>-Dsvm.targetName=linux_raspberrypi</additionalArgs>

</properties>

</profile>

<id>windows64</id>

<clientTarget>windows</clientTarget>

<additionalArgs>-Dsvm.targetName=windows</additionalArgs>

</properties>

</profile>

<id>linux64</id>

<additionalArgs>-Dsvm.targetName=linux</additionalArgs>

</properties>

</profile>

</profiles>

<id>gluon-releases</id>

<url>http://nexus.gluonhq.com/nexus/content/repositories/releases/</url>

</pluginRepository>

<id>gluon-snapshots</id>

<url>https://nexus.gluonhq.com/nexus/content/repositories/public-snapshots</url>

</pluginRepository>

</pluginRepositories>

</project>

M src/main/java/com/stream_pi/client/connection/Client.java

+8 −8

package com.stream_pi.client.connection;

import com.stream_pi.actionapi.action.Action;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.actionapi.action.ActionType;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.actionapi.action.DisplayTextAlignment;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.actionapi.action.Location;

import com.stream_pi.action_api.action.Location;

import com.stream_pi.actionapi.actionproperty.ClientProperties;

import com.stream_pi.action_api.actionproperty.ClientProperties;

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

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

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

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

import com.stream_pi.client.io.Config;

import com.stream_pi.client.info.ClientInfo;

import com.stream_pi.client.profile.ClientProfile;

import com.stream_pi.client.window.ExceptionAndAlertHandler;

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

import com.stream_pi.themeapi.Theme;

import com.stream_pi.theme_api.Theme;

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.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.net.InetSocketAddress;

import java.net.Socket;

import java.util.ArrayList;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.logging.Logger;

public class Client extends Thread{

private Socket socket;

//private Logger logger;

private DataOutputStream dos;

private DataInputStream dis;

private AtomicBoolean stop = new AtomicBoolean(false);

private ClientListener clientListener;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private ClientInfo clientInfo;

private String serverIP;

private int serverPort;

private Logger logger;

public Client(String serverIP, int serverPort, ClientListener clientListener, ExceptionAndAlertHandler exceptionAndAlertHandler)

{

this.serverIP = serverIP;

this.serverPort = serverPort;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.clientInfo = ClientInfo.getInstance();

this.clientListener = clientListener;

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

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try

{

try {

logger.info("Trying to connect to server at "+serverIP+":"+serverPort);

socket = new Socket();

socket.connect(new InetSocketAddress(serverIP, serverPort), 5000);

clientListener.setConnected(true);

clientListener.updateSettingsConnectDisconnectButton();

logger.info("Connected to "+socket.getRemoteSocketAddress()+" !");

} catch (IOException e) {

e.printStackTrace();

clientListener.setConnected(false);

clientListener.updateSettingsConnectDisconnectButton();

throw new MinorException("connection Error", "Unable to connect to server. Please check settings and connection and try again.");

}

try

{

dos = new DataOutputStream(socket.getOutputStream());

dis = new DataInputStream(socket.getInputStream());

}

catch (IOException e)

{

logger.severe(e.getMessage());

e.printStackTrace();

throw new MinorException("Unable to set up io Streams to server. Check connection and try again.");

}

start();

} catch (MinorException e)

{

exceptionAndAlertHandler.handleMinorException(e);

}

return null;

}

}).start();

}

public synchronized void exit()

{

if(stop.get())

return;

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

try

{

if(socket!=null)

{

disconnect();

}

catch (SevereException e)

{

logger.severe(e.getMessage());

exceptionAndAlertHandler.handleSevereException(e);

e.printStackTrace();

}

public void writeToStream(String text) throws SevereException

{

/*try

{

logger.debug(text);

dos.writeUTF(text);

dos.flush();

}

catch (IOException e)

{

e.printStackTrace();

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

}*/

try

{

byte[] txtBytes = text.getBytes();

Thread.sleep(50);

dos.writeUTF("string:: ::");

dos.flush();

dos.writeInt(txtBytes.length);

dos.flush();

write(txtBytes);

dos.flush();

}

catch (IOException | InterruptedException e)

{

e.printStackTrace();

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

}

public void write(byte[] array) throws SevereException

{

try

{

dos.write(array);

}

catch (IOException e)

{

logger.severe(e.getMessage());

e.printStackTrace();

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

}

@Override

public void run() {

try

{

while(!stop.get())

{

String msg = "";

try

{

String raw = dis.readUTF();

System.out.println("AAAAAAAAAAAAAAAAAA : "+raw);

int length = dis.readInt();

String[] precursor = raw.split("::");

String inputType = precursor[0];

String secondArg = precursor[1];

//ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();

/*int count;

int chunkSize = 512;

while (length>0)

{

if(chunkSize > length)

chunkSize = length;

else

chunkSize = 512;

byte[] buffer = new byte[chunkSize];

count = dis.read(buffer);

byteArrayOutputStream.write(buffer);

length-=count;

}*/

/*byte[] buffer = new byte[8192];

int read;

while((read = dis.read(buffer)) != -1){

System.out.println("READ : "+read);

byteArrayOutputStream.write(buffer, 0, read);

}

byteArrayOutputStream.close();

byte[] bArr = byteArrayOutputStream.toByteArray();*/

byte[] bArr = new byte[length];

dis.readFully(bArr);

if(inputType.equals("string"))

{

msg = new String(bArr);

}

else if(inputType.equals("action_icon"))

{

System.out.println("asdsdsxxxxxxxxxxxxxxxxxxxxxxxxxxx");

String[] secondArgSep = secondArg.split("!!");

String profileID = secondArgSep[0];

String actionID = secondArgSep[1];

clientListener.getClientProfiles().getProfileFromID(profileID).saveActionIcon(actionID, bArr);

Action a = clientListener.getClientProfiles().getProfileFromID(profileID).getActionFromID(actionID);

clientListener.clearActionBox(a.getLocation().getCol(), a.getLocation().getRow());

clientListener.renderAction(profileID, a);

continue;

}

catch (IOException e)

{

logger.severe(e.getMessage());

e.printStackTrace();

clientListener.setConnected(false);

clientListener.updateSettingsConnectDisconnectButton();

if(!stop.get())

{

//isDisconnect.set(true); //Prevent running disconnect

throw new MinorException("Accidentally disconnected from Server! (Failed at readUTF)");

}

exit();

return;

}

logger.info("Received text : '"+msg+"'");

String[] sep = msg.split("::");

String command = sep[0];

switch (command)

{

case "disconnect" : serverDisconnected(msg);

break;

case "get_client_details" : sendClientDetails();

break;

case "get_profiles" : sendProfileNamesToServer();

break;

case "get_profile_details": sendProfileDetailsToServer(sep[1]);

break;

case "save_action_details": saveActionDetails(sep);

break;

case "delete_action": deleteAction(sep[1], sep[2]);

break;

case "get_themes": sendThemesToServer();

break;

case "save_client_details": saveClientDetails(sep);

break;

case "save_client_profile": saveProfileDetails(sep);

break;

case "delete_profile": deleteProfile(sep[1]);

break;

case "action_failed": actionFailed(sep[1], sep[2]);

break;

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

}

catch (SevereException e)

{

logger.severe(e.getMessage());

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

catch (MinorException e)

{

logger.severe(e.getMessage());

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(e);

}

//commands

/*public void receiveActionIcon(String[] sep) throws MinorException {

String profileID = sep[1];

String actionID = sep[2];

int bytesToRead = Integer.parseInt(sep[3]);

int port = Integer.parseInt(sep[4]);

try

{

Socket tempSocket = new Socket(socket.getInetAddress(), port);

tempSocket.setReceiveBufferSize(bytesToRead);

tempSocket.setSoTimeout(10000);

DataInputStream dataInputStream = new DataInputStream(tempSocket.getInputStream());

byte[] dataIcon = new byte[bytesToRead];

dataInputStream.read(dataIcon);

clientProfiles.getProfileFromID(profileID).getActionFromID(actionID).setIcon(dataIcon);

dataInputStream.close();

tempSocket.close();

}

catch (IOException e)

{

e.printStackTrace();

throw new MinorException("Unable to Receive icon");

}

}*/

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

{

try

{

Thread.sleep(50);

dos.writeUTF("action_icon::"+profileID+"!!"+actionID+"!!::"+icon.length);

dos.flush();

dos.writeInt(icon.length);

dos.flush();

write(icon);

dos.flush();

}

catch (IOException | InterruptedException e)

{

e.printStackTrace();

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

}

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

{

try

{

ServerSocket tmpServer = new ServerSocket(0);

dos.writeUTF("action_icon::"+

profileID+"::"+

actionID+"::"+

icon.length+"::"+

tmpServer.getLocalPort()+"::");

Socket socket = tmpServer.accept();

socket.setSendBufferSize(icon.length);

DataOutputStream dataOutputStream = new DataOutputStream(socket.getOutputStream());

dataOutputStream.write(icon);

dataOutputStream.close();

tmpServer.close();

}

catch (IOException e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

}*/

public void disconnect() throws SevereException

{

disconnect("");

}

public void disconnect(String message) throws SevereException

{

if(stop.get())

return;

stop.set(true);

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

writeToStream("disconnect::"+message+"::");

try

{

if(!socket.isClosed())

socket.close();

clientListener.setConnected(false);

clientListener.updateSettingsConnectDisconnectButton();

}

catch (IOException e)

{

e.printStackTrace();

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

}

public void sendThemesToServer() throws SevereException

{

StringBuilder finalQuery = new StringBuilder("themes::");

for(Theme theme : clientListener.getThemes().getThemeList())

{

finalQuery.append(theme.getFullName())

.append("__")

.append(theme.getShortName())

.append("__")

.append(theme.getAuthor())

.append("__")

.append(theme.getVersion().getText())

.append("__::");

}

writeToStream(finalQuery.toString());

}

public void sendActionIcon(String clientProfileID, String actionID) throws SevereException

{

System.out.println("sending action icon "+clientProfileID+", "+actionID);

sendIcon(clientProfileID, actionID, clientListener.getClientProfiles().getProfileFromID(clientProfileID).getActionFromID(actionID).getIconAsByteArray());

}

public void serverDisconnected(String message)

{

stop.set(true);

String txt = "Disconnected!";

if(!message.equals("disconnect::::"))

txt = "Message : "+message.split("::")[1];

exceptionAndAlertHandler.onAlert("Disconnected from Server", txt, StreamPiAlertType.WARNING);

if(!socket.isClosed()) {

try {

socket.close();

} catch (IOException e) {

e.printStackTrace();

}

clientListener.setConnected(false);

clientListener.updateSettingsConnectDisconnectButton();

}

public void sendClientDetails() throws SevereException

{

Version clientVersion = clientInfo.getVersion();

ReleaseStatus releaseStatus = clientInfo.getReleaseStatus();

Version clientCommsStandard = clientInfo.getCommsStandardVersion();

Version clientMinThemeStandard = clientInfo.getMinThemeSupportVersion();

String clientNickname = Config.getInstance().getClientNickName();

double screenWidth = Config.getInstance().getStartupWindowWidth();

double screenHeight = Config.getInstance().getStartupWindowHeight();

Platform OS = clientInfo.getPlatformType();

String defaultProfileID = Config.getInstance().getStartupProfileID();

writeToStream("client_details::"+

clientVersion.getText()+"::"+

releaseStatus+"::"+

clientCommsStandard.getText()+"::"+

clientMinThemeStandard.getText()+"::"+

clientNickname+"::"+

screenWidth+"::"+

screenHeight+"::"+

OS+"::" +

defaultProfileID+"::"+

clientListener.getDefaultThemeFullName()+"::");

}

public void sendProfileNamesToServer() throws SevereException

{

StringBuilder finalQuery = new StringBuilder("profiles::");

finalQuery.append(clientListener.getClientProfiles().getClientProfiles().size()).append("::");

for(ClientProfile clientProfile : clientListener.getClientProfiles().getClientProfiles())

{

finalQuery.append(clientProfile.getID()).append("::");

}

writeToStream(finalQuery.toString());

}

public void sendProfileDetailsToServer(String ID) throws SevereException

{

StringBuilder finalQuery = new StringBuilder("profile_details::");

ClientProfile clientProfile = clientListener.getClientProfiles().getProfileFromID(ID);

finalQuery.append(ID).append("::");

finalQuery.append(clientProfile.getName())

.append("::")

.append(clientProfile.getRows())

.append("::")

.append(clientProfile.getCols())

.append("::")

.append(clientProfile.getActionSize())

.append("::")

.append(clientProfile.getActionGap())

.append("::");

writeToStream(finalQuery.toString());

for(Action action : clientProfile.getActions())

{

sendActionDetails(clientProfile.getID(), action);

}

for(Action action : clientProfile.getActions())

{

if(action.isHasIcon())

{

System.out.println("23123123123 : "+action.getID() + action.isHasIcon());

sendActionIcon(clientProfile.getID(), action.getID());

}

public void sendActionDetails(String profileID, Action action) throws SevereException {

if(action == null)

{

logger.info("NO SUCH ACTION");

return;

}

StringBuilder finalQuery = new StringBuilder("action_details::");

finalQuery.append(profileID)

.append("::")

.append(action.getID())

.append("::")

.append(action.getActionType())

.append("::");

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

finalQuery.append(action.getVersion().getText());

}

finalQuery.append("::");

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

{

finalQuery.append(action.getModuleName());

}

finalQuery.append("::");

//display

finalQuery.append(action.getBgColourHex())

.append("::");

//icon

finalQuery.append(action.isHasIcon())

.append("::")

.append(action.isShowIcon())

.append("::");

//text

finalQuery.append(action.isShowDisplayText())

.append("::")

.append(action.getDisplayTextFontColourHex())

.append("::")

.append(action.getDisplayText())

.append("::")

.append(action.getDisplayTextAlignment())

.append("::");

//location

if(action.getLocation() == null)

finalQuery.append("-1::-1::");

else

finalQuery.append(action.getLocation().getRow())

.append("::")

.append(action.getLocation().getCol())

.append("::");

//client properties

ClientProperties clientProperties = action.getClientProperties();

finalQuery.append(clientProperties.getSize())

.append("::");

for(Property property : clientProperties.get())

{

finalQuery.append(property.getName())

.append("__")

.append(property.getRawValue())

.append("__");

finalQuery.append("!!");

}

finalQuery.append("::")

.append(action.getParent())

.append("::");

writeToStream(finalQuery.toString());

}

public void saveActionDetails(String[] sep)

{

String profileID = sep[1];

String ID = sep[2];

ActionType actionType = ActionType.valueOf(sep[3]);

//4 - Version

//5 - ModuleName

//display

String bgColorHex = sep[6];

//icon

boolean isHasIcon = sep[7].equals("true");

boolean isShowIcon = sep[8].equals("true");

//text

boolean isShowDisplayText = sep[9].equals("true");

String displayFontColor = sep[10];

String displayText = sep[11];

DisplayTextAlignment displayTextAlignment = DisplayTextAlignment.valueOf(sep[12]);

//location

String row = sep[13];

String col = sep[14];

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

Action action = new Action(ID, actionType);

if(actionType == ActionType.NORMAL)

{

try

{

action.setVersion(new Version(sep[4]));

action.setModuleName(sep[5]);

}

catch (Exception e)

{

logger.severe(e.getMessage());

e.printStackTrace();

}

action.setBgColourHex(bgColorHex);

action.setShowIcon(isShowIcon);

action.setHasIcon(isHasIcon);

System.out.println("IS HAS ICON : "+isHasIcon+", IS SHOW ICON :"+isShowIcon);

action.setShowDisplayText(isShowDisplayText);

action.setDisplayTextFontColourHex(displayFontColor);

action.setDisplayText(displayText);

action.setDisplayTextAlignment(displayTextAlignment);

action.setLocation(location);

//client properties

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

String[] clientPropertiesRaw = sep[16].split("!!");

ClientProperties clientProperties = new ClientProperties();

if(actionType == ActionType.FOLDER)

clientProperties.setDuplicatePropertyAllowed(true);

for(int i = 0;i<clientPropertiesSize; i++)

{

String[] clientPraw = clientPropertiesRaw[i].split("__");

Property property = new Property(clientPraw[0], Type.STRING);

if(clientPraw.length > 1)

property.setRawValue(clientPraw[1]);

clientProperties.addProperty(property);

}

action.setClientProperties(clientProperties);

String parent = sep[17];

action.setParent(parent);

try

{

Action old = clientListener.getClientProfiles().getProfileFromID(profileID).getActionFromID(action.getID());

if(old != null)

{

if(action.isHasIcon())

action.setIcon(clientListener.getClientProfiles().getProfileFromID(profileID).getActionFromID(action.getID()).getIconAsByteArray());

}

clientListener.getClientProfiles().getProfileFromID(profileID).addAction(action);

System.out.println("XXXXXXXXXXX " +action.isHasIcon());

//clientListener.getClientProfiles().getProfileFromID(profileID).saveActions();

clientListener.getClientProfiles().getProfileFromID(profileID).saveAction(action);

if(clientListener.getCurrentProfile().getID().equals(profileID) && action.getLocation().getCol()!=-1)

{

javafx.application.Platform.runLater(()->{

ActionBox box = clientListener.getActionBox(action.getLocation().getCol(), action.getLocation().getRow());

System.out.println(box==null);

System.out.println("GATYYY : "+action.getLocation().getCol()+","+action.getLocation().getRow());

box.clear();

box.setAction(action);

box.baseInit();

box.init();

});

}

//clientListener.clearActionBox(action.getLocation().getCol(), action.getLocation().getRow());

//clientListener.renderAction(profileID, action);

}

catch (Exception e)

{

e.printStackTrace();

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

}

public void deleteAction(String profileID, String actionID)

{

try

{

Action acc = clientListener.getClientProfiles().getProfileFromID(profileID).getActionFromID(actionID);

if(acc.getActionType() == ActionType.FOLDER)

{

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

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

String folderToBeDeletedID = clientListener.getClientProfiles().getProfileFromID(profileID).getActionFromID(actionID).getID();

folders.add(folderToBeDeletedID);

boolean startOver = true;

while(startOver)

{

startOver = false;

for(Action action : clientListener.getClientProfiles().getProfileFromID(profileID).getActions())

{

if(folders.contains(action.getParent()))

{

if(!idsToBeRemoved.contains(action.getID()))

{

idsToBeRemoved.add(action.getID());

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

{

folders.add(action.getID());

startOver = true;

}

for(String ids : idsToBeRemoved)

{

clientListener.getClientProfiles().getProfileFromID(profileID).removeAction(ids);

}

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

{

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

{

clientListener.getClientProfiles().getProfileFromID(profileID).removeAction(property.getRawValue());

}

clientListener.getClientProfiles().getProfileFromID(profileID).removeAction(acc.getID());

clientListener.getClientProfiles().getProfileFromID(profileID).saveActions();

if(acc.getLocation().getCol()!=-1)

{

clientListener.clearActionBox(acc.getLocation().getCol(), acc.getLocation().getRow());

clientListener.addBlankActionBox(acc.getLocation().getCol(), acc.getLocation().getRow());

}

catch (Exception e)

{

e.printStackTrace();

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

}

public void saveClientDetails(String[] sep)

{

try

{

Config.getInstance().setNickName(sep[1]);

String oldWidth = Config.getInstance().getStartupWindowWidth()+"";

String oldHeight = Config.getInstance().getStartupWindowHeight()+"";

Config.getInstance().setStartupWindowSize(

Double.parseDouble(sep[2]),

Double.parseDouble(sep[3])

);

Config.getInstance().setStartupProfileID(sep[4]);

String oldThemeFullName = Config.getInstance().getCurrentThemeFullName();

Config.getInstance().setCurrentThemeFullName(sep[5]);

if(!oldHeight.equals(sep[3]) || !oldWidth.equals(sep[2]) || !oldThemeFullName.equals(sep[5]))

javafx.application.Platform.runLater(()-> clientListener.init());

Config.getInstance().save();

javafx.application.Platform.runLater(()->clientListener.loadSettings());

}

catch (SevereException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

public void saveProfileDetails(String[] sep) throws SevereException, MinorException

{

ClientProfile clientProfile = clientListener.getClientProfiles().getProfileFromID(sep[1]);

if(clientProfile == null)

{

clientProfile = new ClientProfile(new File(Config.getInstance().getProfilesPath().toString()+"/"+sep[1]+".xml"),

Config.getInstance().getIconsPath());

}

clientProfile.setName(sep[2]);

clientProfile.setRows(Integer.parseInt(sep[3]));

clientProfile.setCols(Integer.parseInt(sep[4]));

clientProfile.setActionSize(Integer.parseInt(sep[5]));

clientProfile.setActionGap(Integer.parseInt(sep[6]));

try

{

clientListener.getClientProfiles().addProfile(clientProfile);

clientProfile.saveProfileDetails();

clientListener.refreshGridIfCurrent(sep[1]);

javafx.application.Platform.runLater(()->clientListener.loadSettings());

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

public void deleteProfile(String ID)

{

clientListener.getClientProfiles().deleteProfile(clientListener.getClientProfiles().getProfileFromID(ID));

}

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

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

}

public void actionFailed(String profileID, String actionID)

{

clientListener.onActionFailed(profileID, actionID);

}

M src/main/java/com/stream_pi/client/connection/ClientListener.java

+3 −3

package com.stream_pi.client.connection;

import com.stream_pi.actionapi.action.Action;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.client.profile.ClientProfile;

import com.stream_pi.client.profile.ClientProfiles;

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

import com.stream_pi.themeapi.Theme;

import com.stream_pi.theme_api.Theme;

import com.stream_pi.themeapi.Themes;

import com.stream_pi.theme_api.Themes;

import com.stream_pi.util.exception.SevereException;

public interface ClientListener {

void onActionFailed(String profileID, String actionID);

void onNormalActionClicked(String profileID, String actionID);

ClientProfiles getClientProfiles();

Themes getThemes();

String getDefaultThemeFullName();

void renderRootDefaultProfile() throws SevereException;

void setConnected(boolean isConnected);

boolean isConnected();

void renderProfile(ClientProfile clientProfile);

void clearActionBox(int col, int row);

void addBlankActionBox(int col, int row);

void renderAction(String currentProfileID, Action action);

void refreshGridIfCurrent(String currentProfileID);

ActionBox getActionBox(int col, int row);

ClientProfile getCurrentProfile();

Theme getCurrentTheme();

void init();

void disconnect(String message) throws SevereException;

void setupClientConnection();

void updateSettingsConnectDisconnectButton();

void onCloseRequest();

void loadSettings();

}

D src/main/java/com/stream_pi/client/connection/protos/ClientConnectionProtos.proto

+0 −49

syntax = "proto3";

package protos;

option java_package = "com.StreamPi.Client.Connection.protos";

option java_outer_classname = "ClientConnectionProtos";

message ClientAction

{

string moduleName = 1;

string id = 2;

enum ActionType

{

FOLDER = 0;

COMBINE = 1;

NORMAL = 2;

}

ActionType actionType = 3;

int32 locationX = 4;

int32 locationY = 5;

bool hasIcon = 6;

string name = 7;

string actionName = 8;

repeated ClientProperty clientProperties = 9;

}

message ClientProperty

{

string name = 1;

string value = 2;

}

message ClientProfile

{

string name = 1;

string id = 2;

int32 rows = 3;

int32 cols = 4;

int32 actionSize = 5;

int32 actionGap = 6;

repeated ClientAction actions = 7;

}

D src/main/java/com/stream_pi/client/connection/protos/ClientGRPC.proto

+0 −13

syntax = "proto3";

package protos;

option java_package = "com.StreamPi.Client.Connection.protos";

option java_outer_classname = "ClientGRPC";

import "com/StreamPi/Client/Connection/protos/ClientConnectionProtos.proto";

service Connection

{

}

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

+1 −1

package com.stream_pi.client.controller;

import com.stream_pi.actionapi.action.Action;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.client.connection.Client;

import com.stream_pi.client.io.Config;

import com.stream_pi.client.info.ClientInfo;

import com.stream_pi.client.profile.ClientProfile;

import com.stream_pi.client.profile.ClientProfiles;

import com.stream_pi.client.window.Base;

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

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.gluonhq.attach.lifecycle.LifecycleService;

import com.gluonhq.attach.util.Services;

import javafx.animation.Interpolator;

import javafx.animation.KeyFrame;

import javafx.animation.KeyValue;

import javafx.animation.Timeline;

import javafx.application.Platform;

import javafx.scene.Node;

import javafx.util.Duration;

import java.io.*;

public class Controller extends Base

{

private Client client;

public Controller()

{

client = null;

}

private boolean firstRun = true;

@Override

public void init()

{

try

{

if(firstRun)

initBase();

applyDefaultTheme();

if(getClientInfo().getPlatformType()!= com.stream_pi.util.platform.Platform.ANDROID && getClientInfo().getPlatformType() != com.stream_pi.util.platform.Platform.IOS) {

getStage().setWidth(getConfig().getStartupWindowWidth());

getStage().setHeight(getConfig().getStartupWindowHeight());

getStage().centerOnScreen();

setupFlags();

}

setupDashWindow();

getStage().show();

requestFocus();

if(Config.getInstance().isFirstTimeUse())

return;

setupSettingsWindowsAnimations();

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

openSettingsTimeLine.play();

});

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

closeSettingsTimeLine.play();

});

setClientProfiles(new ClientProfiles(new File(getConfig().getProfilesPath()), getConfig().getStartupProfileID()));

if(getClientProfiles().getLoadingErrors().size() > 0)

{

StringBuilder errors = new StringBuilder("Please rectify the following errors and try again");

for(MinorException exception : getClientProfiles().getLoadingErrors())

{

errors.append("\n * ")

.append(exception.getMessage());

}

throw new MinorException("Profiles", errors.toString());

}

renderRootDefaultProfile();

loadSettings();

if(firstRun)

{

setupClientConnection();

firstRun = false;

}

catch (SevereException e)

{

handleSevereException(e);

return;

}

catch (MinorException e)

{

handleMinorException(e);

return;

}

@Override

public void setupClientConnection()

{

Platform.runLater(()->getSettingsPane().setDisableStatus(true));

client = new Client(getConfig().getSavedServerHostNameOrIP(), getConfig().getSavedServerPort(), this, this);

}

@Override

public void updateSettingsConnectDisconnectButton() {

getSettingsPane().setConnectDisconnectButtonStatus();

}

@Override

public void disconnect(String message) throws SevereException {

client.disconnect(message);

}

public void setupDashWindow()

{

getStage().setTitle("Stream-Pi Client");

getStage().setOnCloseRequest(e->onCloseRequest());

}

@Override

public void onCloseRequest()

{

if(isConnected())

client.exit();

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

closeLogger();

if (ClientInfo.getInstance().getPlatformType() == com.stream_pi.util.platform.Platform.ANDROID)

Services.get(LifecycleService.class).ifPresent(LifecycleService::shutdown);

}

@Override

public void loadSettings() {

try {

getSettingsPane().loadData();

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

private Timeline openSettingsTimeLine;

private Timeline closeSettingsTimeLine;

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 KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, 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 KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR))

);

closeSettingsTimeLine.setOnFinished(event1 -> {

dashboardNode.toFront();

Platform.runLater(()-> {

try {

getSettingsPane().loadData();

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

});

}

@Override

public void handleMinorException(MinorException e)

{

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

}

@Override

public void handleSevereException(SevereException e)

{

Platform.runLater(()->

{

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

alert.setOnClicked(new StreamPiAlertListener()

{

@Override

public void onClick(String txt)

{

onCloseRequest();

Platform.exit();

}

});

alert.show();

});

}

@Override

public void onAlert(String title, String body, StreamPiAlertType alertType) {

Platform.runLater(()-> genNewAlert(title, body, alertType).show());

}

public StreamPiAlert genNewAlert(String title, String message, StreamPiAlertType alertType)

{

StreamPiAlert alert = new StreamPiAlert(title, message, alertType);

return alert;

}

private boolean isConnected = false;

@Override

public void onActionFailed(String profileID, String actionID) {

Platform.runLater(()-> getDashboardPane().getActionGridPane().actionFailed(profileID, actionID));

}

@Override

public void onNormalActionClicked(String profileID, String actionID) {

try {

client.onActionClicked(profileID, actionID);

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

@Override

public void setConnected(boolean isConnected) {

this.isConnected = isConnected;

}

@Override

public ActionBox getActionBox(int col, int row)

{

return getDashboardPane().getActionGridPane().getActionBox(col, row);

}

@Override

public boolean isConnected()

{

return isConnected;

}

@Override

public void renderProfile(ClientProfile clientProfile) {

try {

getDashboardPane().renderProfile(clientProfile);

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

@Override

public void clearActionBox(int col, int row)

{

Platform.runLater(()->getDashboardPane().getActionGridPane().clearActionBox(col, row));

}

@Override

public void addBlankActionBox(int col, int row)

{

Platform.runLater(()->getDashboardPane().getActionGridPane().addBlankActionBox(col, row));

}

@Override

public void renderAction(String currentProfileID, Action action)

{

Platform.runLater(()->{

try {

if(getDashboardPane().getActionGridPane().getCurrentParent().equals(action.getParent()) &&

getDashboardPane().getActionGridPane().getClientProfile().getID().equals(currentProfileID))

{

getDashboardPane().getActionGridPane().renderAction(action);

}

catch (Exception e)

{

e.printStackTrace();

}

});

}

@Override

public void refreshGridIfCurrent(String profileID) {

ClientProfile clientProfile = getDashboardPane().getActionGridPane().getClientProfile();

if(clientProfile.getID().equals(profileID))

{

Platform.runLater(()->{

try {

getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID));

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

});

}

@Override

public ClientProfile getCurrentProfile() {

return getDashboardPane().getActionGridPane().getClientProfile();

}

M src/main/java/com/stream_pi/client/profile/ClientProfile.java

+7 −7

package com.stream_pi.client.profile;

import java.io.File;

import java.io.FileOutputStream;

import java.io.OutputStream;

import java.nio.file.Files;

import java.nio.file.NoSuchFileException;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.logging.Logger;

import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilderFactory;

import javax.xml.transform.Result;

import javax.xml.transform.Source;

import javax.xml.transform.Transformer;

import javax.xml.transform.TransformerFactory;

import javax.xml.transform.dom.DOMSource;

import javax.xml.transform.stream.StreamResult;

import com.stream_pi.actionapi.action.Action;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.actionapi.action.ActionType;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.actionapi.action.DisplayTextAlignment;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.actionapi.action.Location;

import com.stream_pi.action_api.action.Location;

import com.stream_pi.actionapi.actionproperty.ClientProperties;

import com.stream_pi.action_api.actionproperty.ClientProperties;

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

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

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

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

import com.stream_pi.client.info.ClientInfo;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.version.Version;

import com.stream_pi.util.xmlconfighelper.XMLConfigHelper;

import org.w3c.dom.Document;

import org.w3c.dom.Element;

import org.w3c.dom.Node;

import org.w3c.dom.NodeList;

public class ClientProfile implements Cloneable{

private String name, ID;

private int rows, cols, actionSize, actionGap;

private HashMap<String, Action> actions;

private String iconsPath;

private File file;

private Logger logger;

private Document document;

public ClientProfile(File file, String iconsPath) throws MinorException

{

this.file = file;

this.iconsPath = iconsPath;

actions = new HashMap<>();

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

if(!file.exists() && !file.isFile())

createConfigFile(file);

try

{

DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

DocumentBuilder docBuilder = docFactory.newDocumentBuilder();

document = docBuilder.parse(file);

}

catch (Exception e)

{

e.printStackTrace();

throw new MinorException("profile", "Unable to read profile config file.");

}

setID(file.getName().replace(".xml", ""));

load();

}

private Element getProfileElement()

{

return (Element) document.getElementsByTagName("profile").item(0);

}

private Element getActionsElement()

{

return (Element) document.getElementsByTagName("actions").item(0);

}

public void load() throws MinorException

{

try

{

actions.clear();

logger.info("Loading profile "+getID()+" ...");

String name = XMLConfigHelper.getStringProperty(getProfileElement(), "name");

int rows = XMLConfigHelper.getIntProperty(getProfileElement(), "rows");

int cols = XMLConfigHelper.getIntProperty(getProfileElement(), "cols");

int actionSize = XMLConfigHelper.getIntProperty(getProfileElement(), "action-size");

int actionGap = XMLConfigHelper.getIntProperty(getProfileElement(), "action-gap");

setName(name);

setRows(rows);

setCols(cols);

setActionSize(actionSize);

setActionGap(actionGap);

//Load Actions

NodeList actionsNodesList = getActionsElement().getChildNodes();

int actionsSize = actionsNodesList.getLength();

logger.info("Actions Size : "+actionsSize);

for(int item = 0; item<actionsSize; item++)

{

Node eachActionNode = actionsNodesList.item(item);

if(eachActionNode.getNodeType() != Node.ELEMENT_NODE)

continue;

Element eachActionElement = (Element) eachActionNode;

if(!eachActionElement.getNodeName().equals("action"))

continue;

String id = XMLConfigHelper.getStringProperty(eachActionElement, "id");

String parent = XMLConfigHelper.getStringProperty(eachActionElement, "parent");

logger.info("Loading action "+id+" ...");

ActionType actionType = ActionType.valueOf(XMLConfigHelper.getStringProperty(eachActionElement, "action-type"));

Action action = new Action(id, actionType);

action.setParent(parent);

ClientProperties properties = new ClientProperties();

if(actionType == ActionType.FOLDER)

properties.setDuplicatePropertyAllowed(true);

if(actionType == ActionType.NORMAL)

{

action.setVersion(new Version(XMLConfigHelper.getStringProperty(eachActionElement, "version")));

action.setModuleName(XMLConfigHelper.getStringProperty(eachActionElement, "module-name"));

}

Node propertiesNode = eachActionElement.getElementsByTagName("properties").item(0);

NodeList propertiesNodesList = propertiesNode.getChildNodes();

int propertiesSize = propertiesNodesList.getLength();

for(int propItem = 0; propItem < propertiesSize; propItem++)

{

Node eachPropertyNode = propertiesNodesList.item(propItem);

if(eachPropertyNode.getNodeType() != Node.ELEMENT_NODE)

continue;

Element eachPropertyElement = (Element) eachPropertyNode;

if(eachPropertyElement.getNodeName() != "property")

continue;

String propertyName = XMLConfigHelper.getStringProperty(eachPropertyElement, "name");

String propertyValue = XMLConfigHelper.getStringProperty(eachPropertyElement, "value");

logger.info("Property Name : "+propertyName);

logger.info("Property Value : "+propertyValue);

Property p = new Property(propertyName, Type.STRING);

p.setRawValue(propertyValue);

properties.addProperty(p);

}

action.setClientProperties(properties);

Element displayElement = (Element) eachActionElement.getElementsByTagName("display").item(0);

//display

//location

try

{

Element locationElement = (Element) displayElement.getElementsByTagName("location").item(0);

int row = XMLConfigHelper.getIntProperty(locationElement, "row");

int col = XMLConfigHelper.getIntProperty(locationElement, "col");

action.setLocation(new Location(row, col));

}

catch (Exception e)

{

logger.info("Action has no location, most probably a combine action child");

}

//background

Element backgroundElement = (Element) displayElement.getElementsByTagName("background").item(0);

action.setBgColourHex(XMLConfigHelper.getStringProperty(backgroundElement, "colour-hex"));

Element iconElement = (Element) backgroundElement.getElementsByTagName("icon").item(0);

boolean showIcon = XMLConfigHelper.getBooleanProperty(iconElement, "show");

boolean hasIcon = XMLConfigHelper.getBooleanProperty(iconElement, "has");

Element textElement = (Element) displayElement.getElementsByTagName("text").item(0);

boolean showText = XMLConfigHelper.getBooleanProperty(textElement, "show");

String displayTextFontColour = XMLConfigHelper.getStringProperty(textElement, "colour-hex");

DisplayTextAlignment displayTextAlignment = DisplayTextAlignment.valueOf(XMLConfigHelper.getStringProperty(textElement, "alignment"));

action.setDisplayTextAlignment(displayTextAlignment);

action.setShowIcon(showIcon);

action.setHasIcon(hasIcon);

action.setShowDisplayText(showText);

action.setDisplayTextFontColourHex(displayTextFontColour);

String displayText = XMLConfigHelper.getStringProperty(textElement, "display-text");

action.setDisplayText(displayText);

if(hasIcon)

{

File f = new File(iconsPath+"/"+id);

try

{

byte[] iconFileByteArray = Files.readAllBytes(f.toPath());

action.setIcon(iconFileByteArray);

}

catch(NoSuchFileException e)

{

action.setIcon(null);

action.setHasIcon(false);

action.setShowIcon(false);

saveAction(action);

}

addAction(action);

logger.info("... Done!");

}

logger.info("Loaded profile "+getID()+" ("+getName()+") !");

}

catch (Exception e)

{

e.printStackTrace();

throw new MinorException("profile", "profile is corrupt.");

}

public void addAction(Action action) throws CloneNotSupportedException {

actions.put(action.getID(), (Action) action.clone());

}

private void createConfigFile(File file) throws MinorException

{

try

{

file.createNewFile();

DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();

DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();

Document newDocument = dBuilder.newDocument();

Element rootElement = newDocument.createElement("config");

newDocument.appendChild(rootElement);

Element profileElement = newDocument.createElement("profile");

rootElement.appendChild(profileElement);

Element actionsElement = newDocument.createElement("actions");

rootElement.appendChild(actionsElement);

Element nameElement = newDocument.createElement("name");

nameElement.setTextContent("Untitled profile");

profileElement.appendChild(nameElement);

Element rowsElement = newDocument.createElement("rows");

rowsElement.setTextContent("3");

profileElement.appendChild(rowsElement);

Element colsElement = newDocument.createElement("cols");

colsElement.setTextContent("3");

profileElement.appendChild(colsElement);

Element actionSizeElement = newDocument.createElement("action-size");

actionSizeElement.setTextContent("100");

profileElement.appendChild(actionSizeElement);

Element actionGapElement = newDocument.createElement("action-gap");

actionGapElement.setTextContent("5");

profileElement.appendChild(actionGapElement);

TransformerFactory transformerFactory = TransformerFactory.newInstance();

Transformer transformer = transformerFactory.newTransformer();

DOMSource source = new DOMSource(newDocument);

StreamResult result = new StreamResult(file);

transformer.transform(source, result);

}

catch (Exception e)

{

e.printStackTrace();

throw new MinorException(e.getMessage());

}

public void deleteProfile()

{

file.delete();

}

public void saveAction(Action action) throws Exception {

Element newActionElement = document.createElement("action");

getActionsElement().appendChild(newActionElement);

Element idElement = document.createElement("id");

idElement.setTextContent(action.getID());

newActionElement.appendChild(idElement);

Element parentElement = document.createElement("parent");

parentElement.setTextContent(action.getParent());

newActionElement.appendChild(parentElement);

Element actionTypeElement = document.createElement("action-type");

actionTypeElement.setTextContent(action.getActionType()+"");

newActionElement.appendChild(actionTypeElement);

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

{

Element versionElement = document.createElement("version");

versionElement.setTextContent(action.getVersion().getText());

newActionElement.appendChild(versionElement);

System.out.println(action.getModuleName());

Element moduleNameElement = document.createElement("module-name");

moduleNameElement.setTextContent(action.getModuleName());

newActionElement.appendChild(moduleNameElement);

}

Element displayElement = document.createElement("display");

newActionElement.appendChild(displayElement);

Element backgroundElement = document.createElement("background");

displayElement.appendChild(backgroundElement);

Element colourHexElement = document.createElement("colour-hex");

colourHexElement.setTextContent(action.getBgColourHex());

backgroundElement.appendChild(colourHexElement);

Element iconElement = document.createElement("icon");

Element iconShowElement = document.createElement("show");

iconShowElement.setTextContent(action.isShowIcon()+"");

iconElement.appendChild(iconShowElement);

Element iconHasElement = document.createElement("has");

iconHasElement.setTextContent(action.isHasIcon()+"");

iconElement.appendChild(iconHasElement);

backgroundElement.appendChild(iconElement);

Element textElement = document.createElement("text");

displayElement.appendChild(textElement);

Element textTolourHexElement = document.createElement("colour-hex");

textTolourHexElement.setTextContent(action.getDisplayTextFontColourHex());

textElement.appendChild(textTolourHexElement);

Element textShowElement = document.createElement("show");

textShowElement.setTextContent(action.isShowDisplayText()+"");

textElement.appendChild(textShowElement);

Element textDisplayTextElement = document.createElement("display-text");

textDisplayTextElement.setTextContent(action.getDisplayText());

textElement.appendChild(textDisplayTextElement);

Element textAlignmentElement = document.createElement("alignment");

textAlignmentElement.setTextContent(action.getDisplayTextAlignment()+"");

textElement.appendChild(textAlignmentElement);

Element locationElement = document.createElement("location");

displayElement.appendChild(locationElement);

Element colElement = document.createElement("col");

colElement.setTextContent(action.getLocation().getCol()+"");

locationElement.appendChild(colElement);

Element rowElement = document.createElement("row");

rowElement.setTextContent(action.getLocation().getRow()+"");

locationElement.appendChild(rowElement);

Element propertiesElement = document.createElement("properties");

newActionElement.appendChild(propertiesElement);

for(String key : action.getClientProperties().getNames())

{

for(Property eachProperty : action.getClientProperties().getMultipleProperties(key))

{

Element propertyElement = document.createElement("property");

propertiesElement.appendChild(propertyElement);

Element nameElement = document.createElement("name");

nameElement.setTextContent(eachProperty.getName());

propertyElement.appendChild(nameElement);

Element valueElement = document.createElement("value");

valueElement.setTextContent(eachProperty.getRawValue());

propertyElement.appendChild(valueElement);

}

save();

}

private int getActionIndexInConfig(String actionID)

{

NodeList actionsList = getActionsElement().getChildNodes();

int actionsSize = actionsList.getLength();

int index = 0;

for(int i = 0;i<actionsSize;i++)

{

Node eachActionNode = actionsList.item(index);

if(eachActionNode.getNodeType() != Node.ELEMENT_NODE)

continue;

if(!eachActionNode.getNodeName().equals("action"))

continue;

Element eachActionElement = (Element) eachActionNode;

Element idElement = (Element) eachActionElement.getElementsByTagName("id").item(0);

if(idElement.getTextContent().equals(actionID))

return index;

index++;

}

return -1;

}

public void saveActionIcon(String actionID, byte[] array){

int index = getActionIndexInConfig(actionID);

getActionFromID(actionID).setIcon(array);

File iconFile = new File(iconsPath+"/"+actionID);

if(iconFile.exists())

{

boolean result = iconFile.delete();

System.out.println("result : "+result);

}

try

{

OutputStream outputStream = new FileOutputStream(iconFile);

outputStream.write(array);

outputStream.flush();

outputStream.close();

Element actionElement = (Element) getActionsElement().getElementsByTagName("action").item(index);

Element displayElement = (Element) actionElement.getElementsByTagName("display").item(0);

Element backgroundElement = (Element) displayElement.getElementsByTagName("background").item(0);

Element iconElement = (Element) backgroundElement.getElementsByTagName("icon").item(0);

Element hasElement = (Element) iconElement.getElementsByTagName("has").item(0);

hasElement.setTextContent("true");

save();

}

catch (Exception e)

{

e.printStackTrace();

}

private void save() throws Exception

{

Transformer transformer = TransformerFactory.newInstance().newTransformer();

Result output = new StreamResult(file);

Source input = new DOMSource(document);

transformer.transform(input, output);

}

public void saveProfileDetails() throws Exception {

XMLConfigHelper.removeChilds(getProfileElement());

Element nameElement = document.createElement("name");

nameElement.setTextContent(getName());

getProfileElement().appendChild(nameElement);

Element rowsElement = document.createElement("rows");

rowsElement.setTextContent(getRows()+"");

getProfileElement().appendChild(rowsElement);

Element colsElement = document.createElement("cols");

colsElement.setTextContent(getCols()+"");

getProfileElement().appendChild(colsElement);

Element actionSizeElement = document.createElement("action-size");

actionSizeElement.setTextContent(getActionSize()+"");

getProfileElement().appendChild(actionSizeElement);

Element actionGapElement = document.createElement("action-gap");

actionGapElement.setTextContent(getActionGap()+"");

getProfileElement().appendChild(actionGapElement);

save();

}

public void saveActions() throws Exception

{

XMLConfigHelper.removeChilds(getActionsElement());

save();

for(Action action : getActions())

{

logger.info("ACTION ID :"+action.getID());

logger.info("Action ICON : "+action.isHasIcon());

saveAction(action);

}

public void removeAction(String ID) throws Exception {

int index = getActionIndexInConfig(ID);

if(index>-1)

{

Element actionElement = (Element) getActionsElement().getElementsByTagName("action").item(index);

Element displayElement = (Element) actionElement.getElementsByTagName("display").item(0);

Element backgroundElement = (Element) displayElement.getElementsByTagName("background").item(0);

Element iconElement = (Element) backgroundElement.getElementsByTagName("icon").item(0);

if(XMLConfigHelper.getBooleanProperty(iconElement, "has"))

{

File file = new File(ClientInfo.getInstance().getPrePath()+iconsPath+"/"+ID);

System.out.println(file.delete());

}

actions.remove(ID);

}

public ArrayList<Action> getActions()

{

ArrayList<Action> p = new ArrayList<>();

for(String profile : actions.keySet())

p.add(actions.get(profile));

return p;

}

public String getID()

{

return ID;

}

public String getName()

{

return name;

}

public int getRows()

{

return rows;

}

public int getCols()

{

return cols;

}

public int getActionSize()

{

return actionSize;

}

public Action getActionFromID(String ID)

{

return actions.getOrDefault(ID, null);

}

public int getActionGap()

{

return actionGap;

}

public void setRows(int rows)

{

this.rows = rows;

}

public void setCols(int cols)

{

this.cols = cols;

}

public void setID(String ID)

{

this.ID = ID;

}

public void setActionSize(int actionSize)

{

this.actionSize = actionSize;

}

public void setActionGap(int actionGap)

{

this.actionGap = actionGap;

}

public void setName(String name)

{

this.name = name;

}

public Object clone() throws CloneNotSupportedException

{

return super.clone();

}

M src/main/java/com/stream_pi/client/window/Base.java

+2 −2

package com.stream_pi.client.window;

import com.stream_pi.client.connection.ClientListener;

import com.stream_pi.client.io.Config;

import com.stream_pi.client.info.ClientInfo;

import java.io.File;

import java.util.logging.Logger;

import com.stream_pi.client.Main;

import com.stream_pi.client.profile.ClientProfiles;

import com.stream_pi.client.window.dashboard.DashboardBase;

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

import com.stream_pi.client.window.settings.SettingsBase;

import com.stream_pi.themeapi.Theme;

import com.stream_pi.theme_api.Theme;

import com.stream_pi.themeapi.Themes;

import com.stream_pi.theme_api.Themes;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.combobox.StreamPiComboBox;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.iohelper.IOHelper;

import com.stream_pi.util.loggerhelper.StreamPiLogFallbackHandler;

import com.stream_pi.util.loggerhelper.StreamPiLogFileHandler;

import com.stream_pi.util.platform.Platform;

import javafx.scene.CacheHint;

import javafx.scene.Cursor;

import javafx.scene.input.KeyCombination;

import javafx.scene.layout.StackPane;

import javafx.scene.text.Font;

import javafx.stage.Stage;

public abstract class Base extends StackPane implements ExceptionAndAlertHandler, ClientListener {

private Config config;

private ClientProfiles clientProfiles;

private ClientInfo clientInfo;

private Stage stage;

public Stage getStage()

{

return stage;

}

public Logger getLogger()

{

return logger;

}

private DashboardBase dashboardBase;

private SettingsBase settingsBase;

private FirstTimeUse firstTimeUse;

public FirstTimeUse getFirstTimeUse() {

return firstTimeUse;

}

private StackPane alertStackPane;

@Override

public ClientProfiles getClientProfiles() {

return clientProfiles;

}

public void setClientProfiles(ClientProfiles clientProfiles) {

this.clientProfiles = clientProfiles;

}

private Logger logger = null;

private StreamPiLogFileHandler logFileHandler = null;

private StreamPiLogFallbackHandler logFallbackHandler = null;

public void initLogger()

{

try

{

if(logger != null || logFileHandler != null)

return;

closeLogger();

logger = Logger.getLogger("");

if(new File(ClientInfo.getInstance().getPrePath()).getAbsoluteFile().getParentFile().canWrite())

{

String path = ClientInfo.getInstance().getPrePath()+"../streampi.log";

if(ClientInfo.getInstance().getPlatformType() == Platform.ANDROID)

path = ClientInfo.getInstance().getPrePath()+"streampi.log";

logFileHandler = new StreamPiLogFileHandler(path);

logger.addHandler(logFileHandler);

}

else

{

logFallbackHandler = new StreamPiLogFallbackHandler();

logger.addHandler(logFallbackHandler);

}

catch(Exception e)

{

e.printStackTrace();

//throw new SevereException("Cant get logger started!");

}

public void closeLogger()

{

if(logFileHandler != null)

logFileHandler.close();

else if(logFallbackHandler != null)

logFallbackHandler.close();

}

public void initBase() throws SevereException

{

stage = (Stage) getScene().getWindow();

initLogger();

clientInfo = ClientInfo.getInstance();

dashboardBase = new DashboardBase(this, this);

dashboardBase.setCache(true);

dashboardBase.setCacheHint(CacheHint.SPEED);

dashboardBase.prefWidthProperty().bind(widthProperty());

dashboardBase.prefHeightProperty().bind(heightProperty());

settingsBase = new SettingsBase(this, this);

settingsBase.setCache(true);

settingsBase.setCacheHint(CacheHint.SPEED);

alertStackPane = new StackPane();

alertStackPane.setVisible(false);

StreamPiAlert.setParent(alertStackPane);

StreamPiComboBox.setParent(alertStackPane);

firstTimeUse = new FirstTimeUse(this, this);

getChildren().clear();

getChildren().addAll(settingsBase, dashboardBase, alertStackPane);

setStyle(null);

checkPrePathDirectory();

config = Config.getInstance();

if(config.isFirstTimeUse())

{

clearStylesheets();

applyDefaultStylesheet();

getChildren().add(firstTimeUse);

firstTimeUse.toFront();

}

else

{

dashboardBase.toFront();

}

registerThemes();

}

private void checkPrePathDirectory() throws SevereException

{

try

{

File filex = new File(ClientInfo.getInstance().getPrePath());

if(filex.getAbsoluteFile().getParentFile().canWrite())

{

if(!filex.exists())

{

filex.mkdirs();

IOHelper.unzip(Main.class.getResourceAsStream("Default.obj"), ClientInfo.getInstance().getPrePath());

}

else

{

throw new SevereException("No storage permission. Give it!");

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

public void setupFlags()

{

//Full Screen

if(getConfig().isFullscreen())

{

getStage().setFullScreenExitKeyCombination(KeyCombination.NO_MATCH);

getStage().setFullScreen(true);

}

else

{

getStage().setFullScreenExitKeyCombination(KeyCombination.keyCombination("Esc"));

getStage().setFullScreen(false);

}

//Cursor

if(getConfig().isShowCursor())

{

setCursor(Cursor.DEFAULT);

}

else

{

setCursor(Cursor.NONE);

}

public SettingsBase getSettingsPane() {

return settingsBase;

}

public DashboardBase getDashboardPane() {

return dashboardBase;

}

public void renderRootDefaultProfile() throws SevereException {

getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(

Config.getInstance().getStartupProfileID()

));

}

public void clearStylesheets()

{

getStylesheets().clear();

}

public void applyDefaultStylesheet()

{

Font.loadFont(Main.class.getResourceAsStream("Roboto.ttf"), 13);

getStylesheets().add(Main.class.getResource("style.css").toExternalForm());

}

public Config getConfig()

{

return config;

}

public ClientInfo getClientInfo()

{

return clientInfo;

}

private Theme currentTheme;

@Override

public Theme getCurrentTheme()

{

return currentTheme;

}

public void applyTheme(Theme t)

{

logger.info("Applying theme '"+t.getFullName()+"' ...");

if(t.getFonts() != null)

{

for(String fontFile : t.getFonts())

{

Font.loadFont(fontFile.replace("%20",""), 13);

}

currentTheme = t;

clearStylesheets();

getStylesheets().addAll(t.getStylesheets());

applyDefaultStylesheet();

logger.info("... Done!");

}

Themes themes;

public void registerThemes() throws SevereException

{

logger.info("Loading themes ...");

themes = new Themes(getConfig().getThemesPath(), getConfig().getCurrentThemeFullName(), clientInfo.getMinThemeSupportVersion());

if(themes.getErrors().size()>0)

{

StringBuilder themeErrors = new StringBuilder();

for(MinorException eachException : themes.getErrors())

{

themeErrors.append("\n * ").append(eachException.getShortMessage());

}

if(themes.getIsBadThemeTheCurrentOne())

{

themeErrors.append("\n\nReverted to default theme! (").append(getConfig().getDefaultCurrentThemeFullName()).append(")");

getConfig().setCurrentThemeFullName(getConfig().getDefaultCurrentThemeFullName());

getConfig().save();

}

handleMinorException(new MinorException("Theme Loading issues", themeErrors.toString()));

}

logger.info("... Done!");

}

@Override

public Themes getThemes() {

return themes;

}

public void applyDefaultTheme()

{

logger.info("Applying default theme ...");

boolean foundTheme = false;

for(Theme t: themes.getThemeList())

{

if(t.getFullName().equals(config.getCurrentThemeFullName()))

{

foundTheme = true;

applyTheme(t);

break;

}

if(foundTheme)

{

logger.info("... Done!");

}

else

{

logger.info("Theme not found. reverting to light theme ...");

try {

Config.getInstance().setCurrentThemeFullName("com.StreamPi.DefaultLight");

Config.getInstance().save();

applyDefaultTheme();

}

catch (SevereException e)

{

handleSevereException(e);

}

@Override

public String getDefaultThemeFullName()

{

return config.getCurrentThemeFullName();

}

M src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java

+3 −3

package com.stream_pi.client.window.dashboard.actiongridpane;

import com.stream_pi.actionapi.action.Action;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.actionapi.action.ActionType;

import com.stream_pi.action_api.action.ActionType;

import com.stream_pi.actionapi.action.DisplayTextAlignment;

import com.stream_pi.action_api.action.DisplayTextAlignment;

import com.stream_pi.client.window.ExceptionAndAlertHandler;

import javafx.animation.Interpolator;

import javafx.animation.KeyFrame;

import javafx.animation.KeyValue;

import javafx.animation.Timeline;

import javafx.geometry.Pos;

import javafx.scene.CacheHint;

import javafx.scene.control.Label;

import javafx.scene.image.Image;

import javafx.scene.layout.Background;

import javafx.scene.layout.BackgroundImage;

import javafx.scene.layout.BackgroundPosition;

import javafx.scene.layout.BackgroundRepeat;

import javafx.scene.layout.BackgroundSize;

import javafx.scene.layout.StackPane;

import javafx.scene.text.TextAlignment;

import javafx.util.Duration;

import org.kordamp.ikonli.javafx.FontIcon;

import java.io.ByteArrayInputStream;

import java.io.ObjectInputStream;

import java.nio.ByteBuffer;

public class ActionBox extends StackPane{

private Label displayTextLabel;

private int row;

private int col;

public int getRow() {

return row;

}

public int getCol() {

return col;

}

public void clear()

{

setAction(null);

setBackground(Background.EMPTY);

setStyle(null);

getChildren().clear();

}

private FontIcon statusIcon;

public void baseInit()

{

displayTextLabel = new Label();

displayTextLabel.setWrapText(true);

displayTextLabel.setTextAlignment(TextAlignment.CENTER);

displayTextLabel.getStyleClass().add("action_box_display_text_label");

displayTextLabel.prefHeightProperty().bind(heightProperty());

displayTextLabel.prefWidthProperty().bind(widthProperty());

statusIcon = new FontIcon();

statusIcon.setOpacity(0);

statusIcon.setCache(true);

statusIcon.setCacheHint(CacheHint.SPEED);

statusIcon.setIconSize(size - 30);

getChildren().addAll(statusIcon, displayTextLabel);

setMinSize(size, size);

setMaxSize(size, size);

getStyleClass().clear();

getStyleClass().add("action_box");

getStyleClass().add("action_box_icon_not_present");

getStyleClass().add("action_box_"+row+"_"+col);

setOnMouseClicked(touchEvent -> actionClicked());

setOnMousePressed(TouchEvent -> {

if(action != null)

{

getStyleClass().add("action_box_onclick");

}

});

setOnMouseReleased(TouchEvent ->{

if(action != null)

{

getStyleClass().remove("action_box_onclick");

}

});

statusIconAnimation = new Timeline(

new KeyFrame(

Duration.millis(0.0D),

new KeyValue(statusIcon.opacityProperty(), 0.0D, Interpolator.EASE_IN)),

new KeyFrame(

Duration.millis(100.0D),

new KeyValue(statusIcon.opacityProperty(), 1.0D, Interpolator.EASE_IN)),

new KeyFrame(

Duration.millis(600.0D),

new KeyValue(statusIcon.opacityProperty(), 1.0D, Interpolator.EASE_OUT)),

new KeyFrame(

Duration.millis(700.0D),

new KeyValue(statusIcon.opacityProperty(), 0.0D, Interpolator.EASE_OUT))

);

statusIconAnimation.setOnFinished(event -> {

statusIcon.toBack();

});

}

public void actionClicked()

{

if(action!=null)

{

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

{

getActionGridPaneListener().renderFolder(action.getID());

}

else

{

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

{

getActionGridPaneListener().combineActionClicked(action.getID());

}

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

{

getActionGridPaneListener().normalActionClicked(action.getID());

}

public FontIcon getStatusIcon() {

return statusIcon;

}

private Timeline statusIconAnimation;

public Timeline getStatusIconAnimation() {

return statusIconAnimation;

}

public ActionGridPaneListener getActionGridPaneListener() {

return actionGridPaneListener;

}

private int size;

private ActionGridPaneListener actionGridPaneListener;

public ActionBox(int size, ActionGridPaneListener actionGridPaneListener, int row, int col)

{

this.actionGridPaneListener = actionGridPaneListener;

this.size = size;

this.row = row;

this.col = col;

baseInit();

}

public static Action deserialize(ByteBuffer buffer) {

try {

ByteArrayInputStream is = new ByteArrayInputStream(buffer.array());

ObjectInputStream ois = new ObjectInputStream(is);

return (Action) ois.readObject();

} catch (Exception e) {

e.printStackTrace();

throw new RuntimeException(e);

}

public void setIcon(byte[] iconByteArray)

{

if(iconByteArray == null)

{

getStyleClass().remove("action_box_icon_present");

getStyleClass().add("action_box_icon_not_present");

setBackground(Background.EMPTY);

}

else

{

getStyleClass().add("action_box_icon_present");

getStyleClass().remove("action_box_icon_not_present");

setBackground(

new Background(

new BackgroundImage(new Image(

new ByteArrayInputStream(iconByteArray), size, size, false, true

), BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.CENTER,

new BackgroundSize(100, 100, true, true, true, false))

)

);

}

private Action action;

public Action getAction() {

return action;

}

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private String parent;

public String getStreamPiParent() {

return parent;

}

public void setStreamPiParent(String parent) {

this.parent = parent;

}

public ActionBox(int size, Action action, ExceptionAndAlertHandler exceptionAndAlertHandler,

ActionGridPaneListener actionGridPaneListener, int row, int col)

{

this.actionGridPaneListener = actionGridPaneListener;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.action = action;

this.size = size;

this.row = row;

this.col = col;

baseInit();

init();

}

public void setAction(Action action)

{

this.action = action;

}

public void init()

{

setDisplayTextFontColour(action.getDisplayTextFontColourHex());

if(action.isShowDisplayText())

setDisplayTextLabel(action.getDisplayText());

else

setDisplayTextLabel("");

setDisplayTextAlignment(action.getDisplayTextAlignment());

setBackgroundColour(action.getBgColourHex());

if(action.isHasIcon() && action.isShowIcon())

{

setIcon(action.getIconAsByteArray());

}

else

{

setIcon(null);

}

public void animateStatus()

{

statusIcon.toFront();

statusIconAnimation.play();

}

public void setDisplayTextLabel(String text)

{

displayTextLabel.setText(text);

}

public void setDisplayTextAlignment(DisplayTextAlignment displayTextAlignment)

{

if(displayTextAlignment == DisplayTextAlignment.CENTER)

displayTextLabel.setAlignment(Pos.CENTER);

else if (displayTextAlignment == DisplayTextAlignment.BOTTOM)

displayTextLabel.setAlignment(Pos.BOTTOM_CENTER);

else if (displayTextAlignment == DisplayTextAlignment.TOP)

displayTextLabel.setAlignment(Pos.TOP_CENTER);

}

public void setDisplayTextFontColour(String colour)

{

System.out.println("'"+colour+"'COLOR");

if(!colour.isEmpty())

{

System.out.println(

"putting ..." + Thread.currentThread().getName()

);

displayTextLabel.setStyle("-fx-text-fill : "+colour+";");

}

public void setBackgroundColour(String colour)

{

System.out.println("COLOr : "+colour);

if(!colour.isEmpty() && action.getIconAsByteArray() == null)

setStyle("-fx-background-color : "+colour);

}

M src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java

+2 −2

package com.stream_pi.client.window.dashboard.actiongridpane;

import java.util.logging.Logger;

import com.stream_pi.actionapi.action.Action;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.actionapi.action.Location;

import com.stream_pi.action_api.action.Location;

import com.stream_pi.client.connection.ClientListener;

import com.stream_pi.client.profile.ClientProfile;

import com.stream_pi.client.window.ExceptionAndAlertHandler;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import javafx.concurrent.Task;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.Node;

import javafx.scene.layout.GridPane;

import javafx.scene.layout.Priority;

import javafx.scene.layout.StackPane;

import javafx.scene.layout.VBox;

import javafx.scene.paint.Color;

import org.kordamp.ikonli.javafx.FontIcon;

public class ActionGridPane extends GridPane implements ActionGridPaneListener {

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private ClientListener clientListener;

public ActionGridPane(ExceptionAndAlertHandler exceptionAndAlertHandler, ClientListener clientListener)

{

this.clientListener = clientListener;

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

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

getStyleClass().add("action_grid_pane");

setPadding(new Insets(5.0));

setPrefSize(USE_COMPUTED_SIZE, USE_COMPUTED_SIZE);

setAlignment(Pos.CENTER);

VBox.setVgrow(this, Priority.ALWAYS);

}

private String currentParent;

public void setCurrentParent(String currentParent) {

this.currentParent = currentParent;

}

public ClientProfile getClientProfile() {

return clientProfile;

}

private int rows, cols;

private ClientProfile clientProfile;

public void setClientProfile(ClientProfile clientProfile)

{

this.clientProfile = clientProfile;

setCurrentParent("root");

setRows(clientProfile.getRows());

setCols(clientProfile.getCols());

}

public void actionFailed(String profileID, String actionID)

{

if(getClientProfile().getID().equals(profileID))

{

Action action = getClientProfile().getActionFromID(actionID);

if(action != null)

{

if(currentParent.equals(action.getParent()))

{

failShow(action);

}

else

{

if(action.getLocation().getCol() == -1)

{

failShow(getClientProfile().getActionFromID(action.getParent()));

}

public void failShow(Action action)

{

for(Node node : getChildren())

{

if(GridPane.getColumnIndex(node) == action.getLocation().getRow() &&

GridPane.getRowIndex(node) == action.getLocation().getCol())

{

ActionBox actionBox = (ActionBox) node;

actionBox.getStatusIcon().setIconLiteral("fas-exclamation-triangle");

actionBox.getStatusIcon().setIconColor(Color.RED);

actionBox.animateStatus();

break;

}

public String getCurrentParent() {

return currentParent;

}

public StackPane getFolderBackButton() throws SevereException

{

StackPane stackPane = new StackPane();

stackPane.getStyleClass().add("action_box");

stackPane.getStyleClass().add("action_box_valid");

stackPane.setPrefSize(

getClientProfile().getActionSize(),

getClientProfile().getActionSize()

);

FontIcon fontIcon = new FontIcon("fas-chevron-left");

fontIcon.getStyleClass().add("folder_action_back_button_icon");

fontIcon.setIconSize(getClientProfile().getActionSize() - 30);

stackPane.setAlignment(Pos.CENTER);

stackPane.getChildren().add(fontIcon);

stackPane.setOnMouseClicked(e->returnToPreviousParent());

return stackPane;

}

public void renderGrid() throws SevereException {

clear();

setHgap(getClientProfile().getActionGap());

setVgap(getClientProfile().getActionGap());

boolean isFolder = false;

if(!getCurrentParent().equals("root"))

{

isFolder = true;

add(getFolderBackButton(), 0,0);

}

for(int row = 0; row<rows; row++)

{

for(int col = 0; col<cols; col++)

{

if(row == 0 && col == 0 && isFolder)

continue;

addBlankActionBox(col, row);

}

public void renderActions()

{

StringBuilder errors = new StringBuilder();

for(Action eachAction : getClientProfile().getActions())

{

logger.info("Action ID : "+eachAction.getID()+"\nInvalid : "+eachAction.isInvalid());

try {

renderAction(eachAction);

}

catch (SevereException e)

{

exceptionAndAlertHandler.handleSevereException(e);

}

catch (MinorException e)

{

errors.append("*").append(e.getShortMessage()).append("\n");

}

if(!errors.toString().isEmpty())

{

exceptionAndAlertHandler.handleMinorException(new MinorException("Error while rendering following actions", errors.toString()));

}

public void clear()

{

getChildren().clear();

}

private Logger logger;

public void clearActionBox(int col, int row)

{

for(Node node : getChildren())

{

if(GridPane.getColumnIndex(node) == row &&

GridPane.getRowIndex(node) == col)

{

getChildren().remove(node);

break;

}

public ActionBox getActionBox(int col, int row)

{

for(Node node : getChildren())

{

if(GridPane.getColumnIndex(node) == row &&

GridPane.getRowIndex(node) == col)

{

return (ActionBox) node;

}

return null;

}

public void addBlankActionBox(int col, int row)

{

ActionBox actionBox = new ActionBox(getClientProfile().getActionSize(), this, row, col);

actionBox.setStreamPiParent(currentParent);

add(actionBox, row, col);

}

public void renderAction(Action action) throws SevereException, MinorException

{

if(!action.getParent().equals(currentParent))

{

logger.info("Skipping action "+action.getID()+", not current parent!");

return;

}

if(action.getLocation().getRow()==-1)

{

logger.info("Action has -1 rowIndex. Probably Combine Action. Skipping ...");

return;

}

if(action.getLocation().getRow() > rows || action.getLocation().getCol() > cols)

{

throw new MinorException("Action "+action.getDisplayText()+" ("+action.getID()+") falls outside bounds.\n" +

" Consider increasing rows/cols from client settings and relocating/deleting it.");

}

Location location = action.getLocation();

ActionBox actionBox = new ActionBox(getClientProfile().getActionSize(), action, exceptionAndAlertHandler, this, location.getRow(), location.getCol());

actionBox.setStreamPiParent(currentParent);

clearActionBox(location.getCol(), location.getRow());

System.out.println(location.getCol()+","+location.getRow());

add(actionBox, location.getRow(), location.getCol());

}

public void setRows(int rows)

{

this.rows = rows;

}

public void setCols(int cols)

{

this.cols = cols;

}

public int getRows()

{

return rows;

}

public int getCols()

{

return cols;

}

private String previousParent;

public void setPreviousParent(String previousParent) {

this.previousParent = previousParent;

}

public String getPreviousParent() {

return previousParent;

}

@Override

public void renderFolder(String actionID) {

setCurrentParent(clientProfile.getActionFromID(actionID).getID());

setPreviousParent(clientProfile.getActionFromID(actionID).getParent());

try {

renderGrid();

renderActions();

} catch (SevereException e) {

e.printStackTrace();

}

@Override

public void normalActionClicked(String ID) {

if(clientListener.isConnected())

clientListener.onNormalActionClicked(getClientProfile().getID(), ID);

else

exceptionAndAlertHandler.onAlert("Not Connected", "Not Connected to any Server", StreamPiAlertType.ERROR);

}

@Override

public void combineActionClicked(String ID) {

if(clientListener.isConnected())

{

new Thread(new Task<Void>() {

@Override

protected Void call()

{

Action action = getClientProfile().getActionFromID(ID);

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

{

try {

logger.info("Clicking "+i+", '"+action.getClientProperties().getSingleProperty(i+"").getRawValue()+"'");

normalActionClicked(action.getClientProperties().getSingleProperty(i+"").getRawValue());

} catch (MinorException e) {

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(e);

}

return null;

}

}).start();

}

public void returnToPreviousParent()

{

setCurrentParent(getPreviousParent());

if(!getPreviousParent().equals("root"))

{

System.out.println("parent : "+getPreviousParent());

setPreviousParent(getClientProfile().getActionFromID(

getPreviousParent()

).getParent());

}

try {

renderGrid();

renderActions();

} catch (SevereException e) {

e.printStackTrace();

}

M src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPaneListener.java

+2 −2

package com.stream_pi.client.window.dashboard.actiongridpane;

import com.stream_pi.actionapi.action.Action;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.actionapi.otheractions.FolderAction;

import com.stream_pi.action_api.otheractions.FolderAction;

public interface ActionGridPaneListener {

void renderFolder(String ID);

void normalActionClicked(String ID);

void combineActionClicked(String ID);

}

M src/main/java/com/stream_pi/client/window/firsttimeuse/FinalConfigPane.java

+1 −2

package com.stream_pi.client.window.firsttimeuse;

import com.stream_pi.client.connection.ClientListener;

import com.stream_pi.client.io.Config;

import com.stream_pi.client.info.ClientInfo;

import com.stream_pi.client.window.ExceptionAndAlertHandler;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.uihelper.HBoxInputBox;

import com.stream_pi.util.uihelper.SpaceFiller;

import com.stream_pi.util.uihelper.SpaceFiller.FillerType;

import com.stream_pi.util.platform.Platform;

import javafx.geometry.Pos;

import javafx.scene.control.Button;

import javafx.scene.control.Label;

import javafx.scene.control.ScrollPane;

import javafx.scene.control.TextField;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.VBox;

public class FinalConfigPane extends VBox

{

private TextField clientNicknameTextField;

private TextField serverIPHostNameTextField;

private TextField serverPortTextField;

private TextField displayWidthTextField;

private TextField displayHeightTextField;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private ClientListener clientListener;

public FinalConfigPane(ExceptionAndAlertHandler exceptionAndAlertHandler, ClientListener clientListener)

{

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.clientListener = clientListener;

getStyleClass().add("first_time_use_pane_final_config");

Label label = new Label("Thats it. Now just a little bit and then you're set!");

label.setWrapText(true);

VBox.setVgrow(label, Priority.ALWAYS);

label.getStyleClass().add("first_time_use_pane_final_config_label");

clientNicknameTextField = new TextField();

serverIPHostNameTextField = new TextField();

serverPortTextField = new TextField();

displayWidthTextField = new TextField();

displayHeightTextField = new TextField();

HBoxInputBox clientNickNameInputBox = new HBoxInputBox("Nickname", clientNicknameTextField);

HBoxInputBox serverIPHostNameInputBox = new HBoxInputBox("Server IP", serverIPHostNameTextField);

HBoxInputBox serverIPPortInputBox = new HBoxInputBox("Server Port", serverPortTextField);

HBoxInputBox displayWidthInputBox = new HBoxInputBox("Display Width", displayWidthTextField);

HBoxInputBox displayHeightInputBox = new HBoxInputBox("Display Height", displayHeightTextField);

if(ClientInfo.getInstance().getPlatformType() == Platform.ANDROID)

{

displayWidthInputBox.setVisible(false);

displayHeightInputBox.setVisible(false);

}

Button confirmButton = new Button("Confirm");

confirmButton.setOnAction(event -> onConfirmButtonClicked());

HBox bBar = new HBox(confirmButton);

bBar.setAlignment(Pos.CENTER_RIGHT);

VBox v = new VBox(clientNickNameInputBox, serverIPHostNameInputBox, serverIPPortInputBox,

displayWidthInputBox, displayHeightInputBox);

v.setSpacing(10.0);

ScrollPane scrollPane = new ScrollPane(v);

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

v.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25));

getChildren().addAll(label, scrollPane,new SpaceFiller(FillerType.VBox), bBar);

getChildren().addAll(label, scrollPane, SpaceFiller.vertical(), bBar);

setSpacing(10.0);

setVisible(false);

}

private void onConfirmButtonClicked()

{

StringBuilder errors = new StringBuilder();

if(clientNicknameTextField.getText().isBlank())

{

errors.append("* Nick name cannot be blank.\n");

}

if(serverIPHostNameTextField.getText().isBlank())

{

errors.append("* Server IP cannot be empty.\n");

}

int port = -1;

try

{

port = Integer.parseInt(serverPortTextField.getText());

if(port < 1024)

errors.append("* Server IP should be above 1024.\n");

}

catch (NumberFormatException exception)

{

errors.append("* Server IP should be a number.\n");

}

double width=-1,height=-1;

if(ClientInfo.getInstance().getPlatformType() != Platform.ANDROID)

{

try

{

width = Double.parseDouble(displayWidthTextField.getText());

if(width < 0)

errors.append("* Display Width should be above 0.\n");

}

catch (NumberFormatException exception)

{

errors.append("* Display Width should be a number.\n");

}

try

{

height = Double.parseDouble(displayHeightTextField.getText());

if(height < 0)

errors.append("* Display Height should be above 0.\n");

}

catch (NumberFormatException exception)

{

errors.append("* Display Height should be a number.\n");

}

if(errors.toString().isEmpty())

{

try

{

Config.getInstance().setNickName(clientNicknameTextField.getText());

Config.getInstance().setServerHostNameOrIP(serverIPHostNameTextField.getText());

Config.getInstance().setServerPort(port);

Config.getInstance().setFirstTimeUse(false);

if(ClientInfo.getInstance().getPlatformType() != Platform.ANDROID)

{

Config.getInstance().setStartupWindowSize(

width, height

);

}

Config.getInstance().save();

clientListener.init();

}

catch(SevereException e)

{

exceptionAndAlertHandler.handleSevereException(e);

}

else

{

new StreamPiAlert("Uh Oh", "Please rectify the following errors and try again:\n"+errors.toString(), StreamPiAlertType.ERROR).show();

}

M src/main/java/com/stream_pi/client/window/firsttimeuse/FirstTimeUse.java

+1 −2

package com.stream_pi.client.window.firsttimeuse;

import com.stream_pi.client.Main;

import com.stream_pi.client.connection.ClientListener;

import com.stream_pi.client.window.ExceptionAndAlertHandler;

import com.stream_pi.util.uihelper.SpaceFiller;

import com.stream_pi.util.uihelper.SpaceFiller.FillerType;

import javafx.geometry.Insets;

import javafx.scene.control.Button;

import javafx.scene.control.Label;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.StackPane;

import javafx.scene.layout.VBox;

import javafx.scene.text.Font;

public class FirstTimeUse extends VBox{

public FirstTimeUse(ExceptionAndAlertHandler exceptionAndAlertHandler, ClientListener clientListener)

{

Font.loadFont(Main.class.getResourceAsStream("Roboto.ttf"), 13);

getStylesheets().add(Main.class.getResource("style.css").toExternalForm());

getStyleClass().add("first_time_use_pane");

setSpacing(10.0);

setPadding(new Insets(5));

headingLabel = new Label();

headingLabel.getStyleClass().add("first_time_use_pane_heading_label");

StackPane stackPane = new StackPane();

stackPane.getStyleClass().add("first_time_use_pane_stackpane");

VBox.setVgrow(stackPane, Priority.ALWAYS);

welcomePane = new WelcomePane();

licensePane = new LicensePane();

finalConfigPane = new FinalConfigPane(exceptionAndAlertHandler, clientListener);

stackPane.getChildren().addAll(

welcomePane,

licensePane,

finalConfigPane

);

nextButton = new Button("Next");

nextButton.setOnAction(event-> onNextButtonClicked());

previousButton = new Button("Previous");

previousButton.setOnAction(event-> onPreviousButtonClicked());

HBox buttonBar = new HBox(previousButton, new SpaceFiller(FillerType.HBox), nextButton);

HBox buttonBar = new HBox(previousButton, SpaceFiller.horizontal(), nextButton);

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

buttonBar.setSpacing(10.0);

getChildren().addAll(headingLabel, stackPane, buttonBar);

setWindow(WindowName.WELCOME);

}

private Label headingLabel;

private Button nextButton;

private Button previousButton;

private WelcomePane welcomePane;

private LicensePane licensePane;

private FinalConfigPane finalConfigPane;

private WindowName windowName;

private void onNextButtonClicked()

{

if(windowName == WindowName.WELCOME)

{

setWindow(WindowName.LICENSE);

}

else if(windowName == WindowName.LICENSE)

{

setWindow(WindowName.FINAL);

}

private void onPreviousButtonClicked()

{

if(windowName == WindowName.FINAL)

{

setWindow(WindowName.LICENSE);

}

else if(windowName == WindowName.LICENSE)

{

setWindow(WindowName.WELCOME);

}

private void setWindow(WindowName windowName)

{

if (windowName == WindowName.WELCOME)

{

this.windowName = WindowName.WELCOME;

welcomePane.toFront();

welcomePane.setVisible(true);

licensePane.setVisible(false);

finalConfigPane.setVisible(false);

headingLabel.setText("");

nextButton.setDisable(false);

previousButton.setDisable(true);

}

else if (windowName == WindowName.LICENSE)

{

this.windowName = WindowName.LICENSE;

licensePane.toFront();

welcomePane.setVisible(false);

licensePane.setVisible(true);

finalConfigPane.setVisible(false);

headingLabel.setText("License Agreement");

nextButton.setDisable(false);

previousButton.setDisable(false);

}

else if (windowName == WindowName.FINAL)

{

this.windowName = WindowName.FINAL;

finalConfigPane.toFront();

welcomePane.setVisible(false);

licensePane.setVisible(false);

finalConfigPane.setVisible(true);

headingLabel.setText("Finishing up ...");

nextButton.setDisable(true);

previousButton.setDisable(false);

}

M src/main/java/com/stream_pi/client/window/settings/SettingsBase.java

+3 −3

package com.stream_pi.client.window.settings;

import java.io.File;

import com.stream_pi.client.connection.ClientListener;

import com.stream_pi.client.io.Config;

import com.stream_pi.client.info.ClientInfo;

import com.stream_pi.client.profile.ClientProfile;

import com.stream_pi.client.window.ExceptionAndAlertHandler;

import com.stream_pi.themeapi.Theme;

import com.stream_pi.theme_api.Theme;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.combobox.StreamPiComboBox;

import com.stream_pi.util.combobox.StreamPiComboBoxFactory;

import com.stream_pi.util.combobox.StreamPiComboBoxListener;

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.SpaceFiller;

import com.stream_pi.util.startatboot.SoftwareType;

import com.stream_pi.util.startatboot.StartAtBoot;

import javafx.application.Platform;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.control.*;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.VBox;

public class SettingsBase extends VBox {

private TextField serverPortTextField;

private TextField serverHostNameOrIPTextField;

private StreamPiComboBox<ClientProfile> clientProfileComboBox;

private StreamPiComboBox<Theme> themeComboBox;

private TextField displayWidthTextField;

private TextField displayHeightTextField;

private TextField nickNameTextField;

private Button closeButton;

private Button saveButton;

private Button connectDisconnectButton;

private Button shutdownButton;

private ToggleButton startOnBootToggleButton;

private ToggleButton showCursorToggleButton;

private ToggleButton fullScreenToggleButton;

private ClientListener clientListener;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private TextField themesPathTextField;

private TextField iconsPathTextField;

private TextField profilesPathTextField;

public SettingsBase(ExceptionAndAlertHandler exceptionAndAlertHandler, ClientListener clientListener) {

getStyleClass().add("settings_base");

this.clientListener = clientListener;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

serverPortTextField = new TextField();

serverHostNameOrIPTextField = new TextField();

nickNameTextField = new TextField();

clientProfileComboBox = new StreamPiComboBox<>();

clientProfileComboBox.setStreamPiComboBoxFactory(new StreamPiComboBoxFactory<ClientProfile>()

{

@Override

public String getOptionDisplayText(ClientProfile object)

{

return object.getName();

}

});

clientProfileComboBox.setStreamPiComboBoxListener(new StreamPiComboBoxListener<ClientProfile>(){

@Override

public void onNewItemSelected(ClientProfile selectedItem)

{

clientListener.renderProfile(selectedItem);

}

});

themeComboBox = new StreamPiComboBox<>();

themeComboBox.setStreamPiComboBoxFactory(new StreamPiComboBoxFactory<Theme>()

{

@Override

public String getOptionDisplayText(Theme object)

{

return object.getShortName();

}

});

displayHeightTextField = new TextField();

displayWidthTextField = new TextField();

themesPathTextField = new TextField();

iconsPathTextField = new TextField();

profilesPathTextField = new TextField();

startOnBootToggleButton = new ToggleButton("Start On Boot");

startOnBootToggleButton.managedProperty().bind(startOnBootToggleButton.visibleProperty());

showCursorToggleButton = new ToggleButton("Show Cursor");

showCursorToggleButton.managedProperty().bind(showCursorToggleButton.visibleProperty());

fullScreenToggleButton = new ToggleButton("Full Screen");

fullScreenToggleButton.managedProperty().bind(fullScreenToggleButton.visibleProperty());

int prefWidth = 200;

Label licenseLabel = new Label("This software is licensed to GNU GPLv3. Check StreamPi Server > settings > About to see full License Statement.");

licenseLabel.setWrapText(true);

Label versionLabel = new Label(ClientInfo.getInstance().getReleaseStatus().getUIName() +" "+ClientInfo.getInstance().getVersion().getText());

HBoxInputBox themesPathInputBox = new HBoxInputBox("Themes Path", themesPathTextField, prefWidth);

themesPathInputBox.managedProperty().bind(themesPathInputBox.visibleProperty());

HBoxInputBox iconsPathInputBox = new HBoxInputBox("Icons Path", iconsPathTextField, prefWidth);

iconsPathInputBox.managedProperty().bind(iconsPathInputBox.visibleProperty());

HBoxInputBox profilesPathInputBox = new HBoxInputBox("Profiles Path", profilesPathTextField, prefWidth);

profilesPathInputBox.managedProperty().bind(profilesPathInputBox.visibleProperty());

HBoxInputBox screenHeightInputBox = new HBoxInputBox("Screen Height", displayHeightTextField, prefWidth);

screenHeightInputBox.managedProperty().bind(screenHeightInputBox.visibleProperty());

HBoxInputBox screenWidthInputBox = new HBoxInputBox("Screen Width", displayWidthTextField, prefWidth);

screenWidthInputBox.managedProperty().bind(screenWidthInputBox.visibleProperty());

if(ClientInfo.getInstance().getPlatformType() == com.stream_pi.util.platform.Platform.ANDROID)

{

themesPathInputBox.setVisible(false);

iconsPathInputBox.setVisible(false);

profilesPathInputBox.setVisible(false);

startOnBootToggleButton.setVisible(false);

showCursorToggleButton.setVisible(false);

fullScreenToggleButton.setVisible(false);

screenHeightInputBox.setVisible(false);

screenWidthInputBox.setVisible(false);

}

VBox vBox = new VBox(

new HBoxInputBox("Device Name", nickNameTextField, prefWidth),

new HBoxInputBox("Host Name/IP", serverHostNameOrIPTextField, prefWidth),

new HBoxInputBox("Port", serverPortTextField, prefWidth),

new HBox(

new Label("Current profile"),

new SpaceFiller(SpaceFiller.FillerType.HBox),

SpaceFiller.horizontal(),

clientProfileComboBox

new HBox(

new Label("Theme"),

new SpaceFiller(SpaceFiller.FillerType.HBox),

SpaceFiller.horizontal(),

themeComboBox

screenHeightInputBox,

screenWidthInputBox,

themesPathInputBox,

iconsPathInputBox,

profilesPathInputBox,

startOnBootToggleButton,

showCursorToggleButton,

fullScreenToggleButton,

licenseLabel,

versionLabel

);

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

vBox.setSpacing(5.0);

vBox.setPadding(new Insets(5));

ScrollPane scrollPane = new ScrollPane();

scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);

VBox.setVgrow(scrollPane, Priority.ALWAYS);

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

scrollPane.setContent(vBox);

vBox.setMinWidth(300);

vBox.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25));

Label settingsLabel = new Label("Settings");

settingsLabel.setPadding(new Insets(5,0,0,5));

settingsLabel.getStyleClass().add("settings_heading_label");

saveButton = new Button("Save");

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

closeButton = new Button("Close");

connectDisconnectButton = new Button("Connect");

connectDisconnectButton.setOnAction(event -> onConnectDisconnectButtonClicked());

shutdownButton = new Button("Shutdown");

shutdownButton.setOnAction(event -> onShutdownButtonClicked());

Button exitButton = new Button("Exit");

exitButton.setOnAction(event -> onExitButtonClicked());

HBox buttonBar = new HBox(connectDisconnectButton, saveButton, exitButton, closeButton);

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

if(ClientInfo.getInstance().getPlatformType() == com.stream_pi.util.platform.Platform.LINUX &&

ClientInfo.getInstance().isShowShutDownButton())

{

buttonBar.getChildren().add(shutdownButton);

}

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

buttonBar.setSpacing(5.0);

buttonBar.setAlignment(Pos.CENTER_RIGHT);

setSpacing(5.0);

getChildren().addAll(

settingsLabel,

scrollPane,

buttonBar

);

}

public void onExitButtonClicked()

{

clientListener.onCloseRequest();

Platform.exit();

}

public void setDisableStatus(boolean status)

{

saveButton.setDisable(status);

connectDisconnectButton.setDisable(status);

}

public void onShutdownButtonClicked()

{

clientListener.onCloseRequest();

try {

Runtime.getRuntime().exec("sudo halt");

}

catch (Exception e)

{

e.printStackTrace();

}

public void onConnectDisconnectButtonClicked()

{

try

{

if(clientListener.isConnected())

clientListener.disconnect("Client disconnected from settings");

else

clientListener.setupClientConnection();

}

catch (SevereException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

public void setConnectDisconnectButtonStatus()

{

Platform.runLater(()->{

setDisableStatus(false);

if(clientListener.isConnected())

connectDisconnectButton.setText("Disconnect");

else

connectDisconnectButton.setText("Connect");

});

}

public Button getCloseButton() {

return closeButton;

}

public void loadData() throws SevereException

{

nickNameTextField.setText(Config.getInstance().getClientNickName());

serverHostNameOrIPTextField.setText(Config.getInstance().getSavedServerHostNameOrIP());

serverPortTextField.setText(Config.getInstance().getSavedServerPort()+"");

clientProfileComboBox.setOptions(clientListener.getClientProfiles().getClientProfiles());

int ind = 0;

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

{

if(clientProfileComboBox.getOptions().get(i).getID().equals(clientListener.getCurrentProfile().getID()))

{

ind = i;

break;

}

clientProfileComboBox.setCurrentSelectedItemIndex(ind);

themeComboBox.setOptions(clientListener.getThemes().getThemeList());

int ind2 = 0;

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

{

if(themeComboBox.getOptions().get(i).getFullName().equals(clientListener.getCurrentTheme().getFullName()))

{

ind2 = i;

break;

}

themeComboBox.setCurrentSelectedItemIndex(ind2);

displayWidthTextField.setText(Config.getInstance().getStartupWindowWidth()+"");

displayHeightTextField.setText(Config.getInstance().getStartupWindowHeight()+"");

themesPathTextField.setText(Config.getInstance().getThemesPath());

iconsPathTextField.setText(Config.getInstance().getIconsPath());

profilesPathTextField.setText(Config.getInstance().getProfilesPath());

startOnBootToggleButton.setSelected(Config.getInstance().isStartOnBoot());

fullScreenToggleButton.setSelected(Config.getInstance().isFullscreen());

showCursorToggleButton.setSelected(Config.getInstance().isShowCursor());

}

public void onSaveButtonClicked()

{

StringBuilder errors = new StringBuilder();

int port = -1;

try

{

port = Integer.parseInt(serverPortTextField.getText());

if(port < 1024)

errors.append("* Server IP should be above 1024.\n");

}

catch (NumberFormatException exception)

{

errors.append("* Server IP should be a number.\n");

}

double width = -1;

try

{

width = Double.parseDouble(displayWidthTextField.getText());

if(width < 0)

errors.append("* Display Width should be above 0.\n");

}

catch (NumberFormatException exception)

{

errors.append("* Display Width should be a number.\n");

}

double height = -1;

try

{

height = Double.parseDouble(displayHeightTextField.getText());

if(height < 0)

errors.append("* Display Height should be above 0.\n");

}

catch (NumberFormatException exception)

{

errors.append("* Display Height should be a number.\n");

}

if(serverHostNameOrIPTextField.getText().isBlank())

{

errors.append("* Server IP cannot be empty.\n");

}

if(nickNameTextField.getText().isBlank())

{

errors.append("* Nick name cannot be blank.\n");

}

if(!errors.toString().isEmpty())

{

exceptionAndAlertHandler.handleMinorException(new MinorException(

"You made mistakes",

"Please fix the errors and try again :\n"+errors.toString()

));

return;

}

try {

boolean toBeReloaded = false;

boolean breakConnection = false;

if(!Config.getInstance().getCurrentThemeFullName().equals(themeComboBox.getCurrentSelectedItem().getFullName()))

toBeReloaded = true;

Config.getInstance().setCurrentThemeFullName(themeComboBox.getCurrentSelectedItem().getFullName());

if(width != Config.getInstance().getStartupWindowWidth() || height != Config.getInstance().getStartupWindowHeight())

toBeReloaded = true;

Config.getInstance().setStartupWindowSize(width, height);

if(!Config.getInstance().getClientNickName().equals(nickNameTextField.getText()))

breakConnection = true;

Config.getInstance().setNickName(nickNameTextField.getText());

if(port != Config.getInstance().getSavedServerPort() || !serverHostNameOrIPTextField.getText().equals(Config.getInstance().getSavedServerHostNameOrIP()))

breakConnection = true;

Config.getInstance().setServerPort(port);

Config.getInstance().setServerHostNameOrIP(serverHostNameOrIPTextField.getText());

boolean startOnBoot = startOnBootToggleButton.isSelected();

if(Config.getInstance().isStartOnBoot() != startOnBoot)

{

if(ClientInfo.getInstance().getRunnerFileName() == null)

{

new StreamPiAlert("Uh Oh", "No Runner File Name Specified as startup arguments. Cant set run at boot.", StreamPiAlertType.ERROR).show();

startOnBoot = false;

}

else

{

StartAtBoot startAtBoot = new StartAtBoot(SoftwareType.CLIENT, ClientInfo.getInstance().getPlatformType());

if(startOnBoot)

{

startAtBoot.create(new File(ClientInfo.getInstance().getRunnerFileName()));

}

else

{

boolean result = startAtBoot.delete();

if(!result)

new StreamPiAlert("Uh Oh!", "Unable to delete starter file", StreamPiAlertType.ERROR).show();

}

Config.getInstance().setStartOnBoot(startOnBoot);

if(Config.getInstance().isFullscreen() != fullScreenToggleButton.isSelected() ||

Config.getInstance().isShowCursor() != showCursorToggleButton.isSelected())

toBeReloaded = true;

Config.getInstance().setFullscreen(fullScreenToggleButton.isSelected());

Config.getInstance().setShowCursor(showCursorToggleButton.isSelected());

if(!Config.getInstance().getThemesPath().equals(themesPathTextField.getText()))

toBeReloaded = true;

Config.getInstance().setThemesPath(themesPathTextField.getText());

if(!Config.getInstance().getIconsPath().equals(iconsPathTextField.getText()))

toBeReloaded = true;

Config.getInstance().setIconsPath(iconsPathTextField.getText());

if(!Config.getInstance().getProfilesPath().equals(profilesPathTextField.getText()))

toBeReloaded = true;

Config.getInstance().setProfilesPath(profilesPathTextField.getText());

Config.getInstance().save();

loadData();

if(breakConnection)

{

if(clientListener.isConnected())

clientListener.disconnect("Client connection settings were changed.");

}

if(toBeReloaded)

{

clientListener.init();

clientListener.renderRootDefaultProfile();

}

catch (SevereException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleSevereException(e);

}

catch (MinorException e)

{

e.printStackTrace();

exceptionAndAlertHandler.handleMinorException(e);

}

M src/main/java/module-info.java

+2 −2

module com.stream_pi.client {

requires javafx.base;

requires javafx.graphics;

requires javafx.controls;

requires org.kordamp.iconli.core;

requires org.kordamp.ikonli.javafx;

requires com.gluonhq.attach.lifecycle;

requires com.gluonhq.attach.util;

requires java.xml;

requires com.stream_pi.util;

requires com.stream_pi.actionapi;

requires com.stream_pi.theme_api;

requires com.stream_pi.themeapi;

requires com.stream_pi.action_api;

requires org.kordamp.ikonli.fontawesome5;

exports com.stream_pi.client;

}

Public

client

Clone or download

Refactored, removed old proto files

Modified Files