From: rnayabed Date: Tue, 09 Feb 2021 21:15:32 +0530 Subject: Refactored to com.stream_pi.actionapi -> com.stream_pi.action_api --- Refactored to com.stream_pi.actionapi -> com.stream_pi.action_api --- --- 'a/pom.xml' +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.stream_pi + com.stream-pi server - 1.0.0 + 1.0.0-SNAPSHOT UTF-8 @@ -22,17 +22,15 @@ 1.9.4 2.7 - 1.0.0 - 1.0.0 - 1.0.0 - + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 2.14.0 11.5.0 11.5.0 - com.stream_pi.server.Main @@ -69,20 +67,20 @@ - com.stream_pi - actionapi + com.stream-pi + action-api ${ActionAPIVersion} - com.stream_pi + com.stream-pi util ${UtilVersion} - com.stream_pi - themeapi + com.stream-pi + theme-api ${ThemeAPIVersion} --- 'a/src/main/java/com/stream_pi/server/action/NormalActionPlugins.java' +++ b/src/main/java/com/stream_pi/server/action/NormalActionPlugins.java @@ -25,14 +25,14 @@ import javax.xml.transform.TransformerFa import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.action.ActionType; -import com.stream_pi.actionapi.action.PropertySaver; -import com.stream_pi.actionapi.action.ServerConnection; -import com.stream_pi.actionapi.actionproperty.ServerProperties; -import com.stream_pi.actionapi.actionproperty.property.Property; -import com.stream_pi.actionapi.actionproperty.property.Type; -import com.stream_pi.actionapi.normalaction.NormalAction; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.action.ActionType; +import com.stream_pi.action_api.action.PropertySaver; +import com.stream_pi.action_api.action.ServerConnection; +import com.stream_pi.action_api.actionproperty.ServerProperties; +import com.stream_pi.action_api.actionproperty.property.Property; +import com.stream_pi.action_api.actionproperty.property.Type; +import com.stream_pi.action_api.normalaction.NormalAction; import com.stream_pi.util.exception.MinorException; import com.stream_pi.util.exception.SevereException; import com.stream_pi.util.exception.StreamPiException; --- 'a/src/main/java/com/stream_pi/server/client/ClientProfile.java' +++ b/src/main/java/com/stream_pi/server/client/ClientProfile.java @@ -16,7 +16,7 @@ Written by : Debayan Sutradhar (rnayabed package com.stream_pi.server.client; -import com.stream_pi.actionapi.action.Action; +import com.stream_pi.action_api.action.Action; import java.util.HashMap; import java.util.Set; --- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java' +++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java @@ -1,13 +1,13 @@ package com.stream_pi.server.connection; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.action.ActionType; -import com.stream_pi.actionapi.action.DisplayTextAlignment; -import com.stream_pi.actionapi.action.Location; -import com.stream_pi.actionapi.actionproperty.ClientProperties; -import com.stream_pi.actionapi.actionproperty.property.Property; -import com.stream_pi.actionapi.actionproperty.property.Type; -import com.stream_pi.actionapi.normalaction.NormalAction; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.action.ActionType; +import com.stream_pi.action_api.action.DisplayTextAlignment; +import com.stream_pi.action_api.action.Location; +import com.stream_pi.action_api.actionproperty.ClientProperties; +import com.stream_pi.action_api.actionproperty.property.Property; +import com.stream_pi.action_api.actionproperty.property.Type; +import com.stream_pi.action_api.normalaction.NormalAction; import com.stream_pi.server.action.NormalActionPlugins; import com.stream_pi.server.client.Client; import com.stream_pi.server.client.ClientProfile; @@ -32,7 +32,8 @@ import java.util.concurrent.atomic.Atomi import java.util.logging.Level; import java.util.logging.Logger; -public class ClientConnection extends Thread{ +public class ClientConnection extends Thread +{ private Socket socket; private ServerListener serverListener; private AtomicBoolean stop = new AtomicBoolean(false); --- 'a/src/main/java/com/stream_pi/server/connection/ConnectionService.java' +++ /dev/null @@ -1,345 +0,0 @@ -/*package com.StreamPi.Server.connection; - -import com.StreamPi.ActionAPI.action.action; -import com.StreamPi.ActionAPI.action.ActionType; -import com.StreamPi.ActionAPI.action.Location; -import com.StreamPi.ActionAPI.ActionProperty.ClientProperties; -import com.StreamPi.ActionAPI.NormalAction.NormalAction; -import com.StreamPi.CommAPI.ConnectionGrpc; -import com.StreamPi.CommAPI.ServerGRPC; -import NormalActionPlugins; -import client; -import ClientProfile; -import ServerInfo; -import com.StreamPi.Util.Exception.MinorException; -import com.StreamPi.Util.Exception.SevereException; -import com.StreamPi.Util.Exception.StreamPiException; -import com.StreamPi.Util.Platform.Platform; -import com.StreamPi.Util.Version.Version; -import io.grpc.stub.StreamObserver; -import javafx.concurrent.Task; -import javafx.scene.control.Alert; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class ConnectionService extends ConnectionGrpc.ConnectionImplBase { - - private client client = null; - private Logger logger; - - ServerListener serverListener; - - final HashMap actionStatuses; - - public ConnectionService(ServerListener serverListener) - { - super(); - - isDisconnect = false; - disconnectMessage = ""; - - logger = LoggerFactory.getLogger(ConnectionService.class); - actionStatuses = new HashMap<>(); - - this.serverListener = serverListener; - } - - - boolean isDisconnect; - String disconnectMessage; - - public void disconnect() - { - disconnect(""); - } - - public void disconnect(String message) - { - if(!isDisconnect) - { - this.isDisconnect = true; - this.disconnectMessage = message; - } - } - - @Override - public void sendClientDetails(ServerGRPC.ClientDetails request, StreamObserver responseObserver) { - - Version clientVersion; - Version commsAPIVersion; - Version themeAPIVersion; - - try - { - clientVersion = new Version(request.getClientVersion()); - commsAPIVersion = new Version(request.getCommAPIVersion()); - themeAPIVersion = new Version(request.getThemeAPIVersion()); - } - catch (MinorException e) - { - e.printStackTrace(); - serverListener.onRPCError(new MinorException("versions invalid. Check stacktrace")); - disconnect(); - return; - } - - - String nickName = request.getNickName(); - Platform platform = Platform.valueOf(request.getPlatform().toString()); - - client = new client(clientVersion, commsAPIVersion, themeAPIVersion, nickName, platform, null); - - boolean sendActions = true; - - if(!commsAPIVersion.isEqual(ServerInfo.getInstance().getCommAPIVersion())) - { - sendActions = false; - disconnect("client CommAPI and Server CommAPI do not match!"); - } - - responseObserver.onNext(ServerGRPC.Status.newBuilder().setSendActions(sendActions).build()); - - responseObserver.onCompleted(); - } - - @Override - public StreamObserver sendClientProfiles(StreamObserver responseObserver) { - - client.getProfiles().clear(); - - ArrayList notFoundActions = new ArrayList<>(); - - return new StreamObserver() { - @Override - public void onNext(ServerGRPC.ClientProfile clientProfile) { - - String name = clientProfile.getName(); - String id = clientProfile.getId(); - - int rows = clientProfile.getRows(); - int cols = clientProfile.getCols(); - - int actionSize = clientProfile.getActionSize(); - int actionGap = clientProfile.getActionGap(); - - ClientProfile finalClientProfile = new ClientProfile(name, id, rows, cols, actionSize, actionGap); - - ArrayList actions = new ArrayList<>(); - - List clientActions = clientProfile.getActionsList(); - for(ServerGRPC.ClientAction clientAction : clientActions) - { - - String actionID = clientAction.getId(); - String actionName = clientAction.getActionName(); - - boolean hasIcon = clientAction.getHasIcon(); - - ActionType actionType = ActionType.valueOf(clientAction.getActionType().toString()); - - action action = new action(actionID, actionType); - action.setActionName(actionName); - - action.setHasIcon(hasIcon); - - int locationX = clientAction.getLocationX(); - int locationY = clientAction.getLocationY(); - - action.setLocation(new Location(locationX, locationY)); - - if(actionType == ActionType.NORMAL) - { - action.setModuleName(clientAction.getModuleName()); - - ClientProperties properties = new ClientProperties(); - - List clientProperties = clientAction.getClientPropertiesList(); - - for(ServerGRPC.ClientProperty clientProperty : clientProperties) - { - String propertyName = clientProperty.getName(); - String propertyValue = clientProperty.getValue(); - - properties.addProperty(propertyName, propertyValue); - } - - action.setClientProperties(properties); - - boolean isFound = false; - for(NormalAction normalAction : NormalActionPlugins.getInstance().getPlugins()) - { - if(normalAction.getModuleName().equals(action.getModuleName())) - { - isFound = true; - - normalAction.setClientProperties(action.getClientProperties()); - normalAction.setActionName(action.getActionName()); - normalAction.setHasIcon(action.isHasIcon()); - normalAction.setID(action.getID()); - normalAction.setLocation(action.getLocation()); - normalAction.setInvalid(false); - - actions.add(normalAction); - - break; - } - } - - if(!isFound) - { - String aName = action.getModuleName(); - - action.setInvalid(true); - - logger.warn("action "+aName+" not found!"); - if(!notFoundActions.contains(aName)) - notFoundActions.add(aName); - - actions.add(action); - } - } - } - - finalClientProfile.setActions(actions); - client.addProfile(finalClientProfile); - - - } - - @Override - public void onError(Throwable throwable) { - serverListener.onRPCError(new SevereException(throwable.getMessage())); - } - - @Override - public void onCompleted() { - - if(!notFoundActions.isEmpty()) - { - StringBuilder all = new StringBuilder("Some actions cannot be edited/used because they are not installed on the server : "); - - for(String each : notFoundActions) - { - all.append("\n * ").append(each); - } - - serverListener.onAlert("Warning",all.toString(), Alert.AlertType.WARNING); - } - - responseObserver.onNext(ServerGRPC.Empty.newBuilder().build()); - responseObserver.onCompleted(); - } - }; - } - - @Override - public void actionClicked(ServerGRPC.ClickedActionID request, StreamObserver responseObserver) { - try - { - action actionClicked = client.getProfileByID(request.getProfileID()).getActionByID(request.getId()); - new Thread(new Task() { - @Override - protected Void call() - { - try - { - synchronized (actionStatuses) - { - actionStatuses.put(request.getId(), serverListener.onActionClicked(actionClicked)); - } - } - catch (MinorException e) - { - serverListener.onRPCError(e); - } - return null; - } - }).start(); - } - catch (MinorException e) - { - e.printStackTrace(); - } - finally { - responseObserver.onNext(ServerGRPC.Empty.newBuilder().build()); - responseObserver.onCompleted(); - } - } - - @Override - public StreamObserver actionClickedStatus(StreamObserver responseObserver) { - return new StreamObserver() { - @Override - public void onNext(ServerGRPC.Empty empty) { - - } - - @Override - public void onError(Throwable throwable) { - serverListener.onRPCError(new StreamPiException(throwable.getMessage())); - } - - @Override - public void onCompleted() { - String id = null; - boolean success = false; - synchronized (actionStatuses) - { - if(!actionStatuses.isEmpty()) - { - for(String key : actionStatuses.keySet()) - { - id = key; - success = actionStatuses.get(id); - - System.out.println("SDSDSDASDASDXZXCZXCZXC"); - break; - } - } - } - - if(id==null) - { - responseObserver.onNext(ServerGRPC.ActionStatus.newBuilder().build()); - } - else - responseObserver.onNext(ServerGRPC.ActionStatus.newBuilder() - .setId(id) - .setIsSuccess(success) - .build()); - - responseObserver.onCompleted(); - } - }; - } - - @Override - public StreamObserver disconnect(StreamObserver responseObserver) { - return new StreamObserver() { - @Override - public void onNext(ServerGRPC.DisconnectMessage disconnectMessage) { - if(disconnectMessage.getIsDisconnect()) - disconnect(disconnectMessage.getMessage()); - } - - @Override - public void onError(Throwable throwable) { - serverListener.onRPCError(new StreamPiException(throwable.getMessage())); - } - - @Override - public void onCompleted() { - responseObserver.onNext(ServerGRPC.DisconnectMessage.newBuilder() - .setIsDisconnect(isDisconnect) - .setMessage(disconnectMessage) - .build()); - responseObserver.onCompleted(); - } - }; - } -} -*/ \ No newline at end of file --- 'a/src/main/java/com/stream_pi/server/connection/MainServer.java' +++ b/src/main/java/com/stream_pi/server/connection/MainServer.java @@ -1,7 +1,6 @@ package com.stream_pi.server.connection; import com.stream_pi.server.window.ExceptionAndAlertHandler; -import com.stream_pi.util.exception.MinorException; import com.stream_pi.util.exception.SevereException; import java.io.IOException; --- 'a/src/main/java/com/stream_pi/server/connection/ServerListener.java' +++ b/src/main/java/com/stream_pi/server/connection/ServerListener.java @@ -1,6 +1,6 @@ package com.stream_pi.server.connection; -import com.stream_pi.actionapi.normalaction.NormalAction; +import com.stream_pi.action_api.normalaction.NormalAction; public interface ServerListener { boolean onNormalActionClicked(NormalAction action); --- 'a/src/main/java/com/stream_pi/server/controller/Controller.java' +++ b/src/main/java/com/stream_pi/server/controller/Controller.java @@ -1,8 +1,8 @@ package com.stream_pi.server.controller; -import com.stream_pi.actionapi.action.ServerConnection; -import com.stream_pi.actionapi.action.PropertySaver; -import com.stream_pi.actionapi.normalaction.NormalAction; +import com.stream_pi.action_api.action.ServerConnection; +import com.stream_pi.action_api.action.PropertySaver; +import com.stream_pi.action_api.normalaction.NormalAction; import com.stream_pi.server.Main; import com.stream_pi.server.action.NormalActionPlugins; import com.stream_pi.server.connection.ClientConnections; --- 'a/src/main/java/com/stream_pi/server/uipropertybox/UIPropertyBox.java' +++ b/src/main/java/com/stream_pi/server/uipropertybox/UIPropertyBox.java @@ -1,7 +1,7 @@ package com.stream_pi.server.uipropertybox; -import com.stream_pi.actionapi.actionproperty.property.ControlType; -import com.stream_pi.actionapi.actionproperty.property.Type; +import com.stream_pi.action_api.actionproperty.property.ControlType; +import com.stream_pi.action_api.actionproperty.property.Type; import javafx.scene.Node; import javafx.scene.control.ComboBox; import javafx.scene.control.Slider; --- 'a/src/main/java/com/stream_pi/server/window/Base.java' +++ b/src/main/java/com/stream_pi/server/window/Base.java @@ -6,8 +6,8 @@ import com.stream_pi.server.info.ServerI import com.stream_pi.server.Main; import com.stream_pi.server.window.dashboard.DashboardBase; import com.stream_pi.server.window.settings.SettingsBase; -import com.stream_pi.themeapi.Theme; -import com.stream_pi.themeapi.Themes; +import com.stream_pi.theme_api.Theme; +import com.stream_pi.theme_api.Themes; import com.stream_pi.util.alert.StreamPiAlert; import com.stream_pi.util.exception.MinorException; import com.stream_pi.util.exception.SevereException; --- 'a/src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java @@ -1,12 +1,12 @@ package com.stream_pi.server.window.dashboard; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.action.ActionType; -import com.stream_pi.actionapi.action.DisplayTextAlignment; -import com.stream_pi.actionapi.actionproperty.property.Property; -import com.stream_pi.actionapi.actionproperty.property.Type; -import com.stream_pi.actionapi.normalaction.NormalAction; -import com.stream_pi.actionapi.otheractions.CombineAction; -import com.stream_pi.actionapi.otheractions.FolderAction; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.action.ActionType; +import com.stream_pi.action_api.action.DisplayTextAlignment; +import com.stream_pi.action_api.actionproperty.property.Property; +import com.stream_pi.action_api.actionproperty.property.Type; +import com.stream_pi.action_api.normalaction.NormalAction; +import com.stream_pi.action_api.otheractions.CombineAction; +import com.stream_pi.action_api.otheractions.FolderAction; import com.stream_pi.server.action.NormalActionPlugins; import com.stream_pi.util.uihelper.SpaceFiller; @@ -62,7 +62,7 @@ public class PluginsPane extends VBox { Label pluginsLabel = new Label("Plugins"); pluginsLabel.getStyleClass().add("plugins_pane_top_label"); - getChildren().addAll(pluginsLabel, pluginsAccordion, new SpaceFiller(SpaceFiller.FillerType.VBox), settingsHBox); + getChildren().addAll(pluginsLabel, pluginsAccordion, SpaceFiller.vertical(), settingsHBox); } public Button getSettingsButton() --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java @@ -1,14 +1,14 @@ package com.stream_pi.server.window.dashboard.actiondetailpane; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.action.ActionType; -import com.stream_pi.actionapi.action.DisplayTextAlignment; -import com.stream_pi.actionapi.action.Location; -import com.stream_pi.actionapi.actionproperty.property.ControlType; -import com.stream_pi.actionapi.actionproperty.property.Property; -import com.stream_pi.actionapi.actionproperty.property.Type; -import com.stream_pi.actionapi.otheractions.CombineAction; -import com.stream_pi.actionapi.otheractions.FolderAction; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.action.ActionType; +import com.stream_pi.action_api.action.DisplayTextAlignment; +import com.stream_pi.action_api.action.Location; +import com.stream_pi.action_api.actionproperty.property.ControlType; +import com.stream_pi.action_api.actionproperty.property.Property; +import com.stream_pi.action_api.actionproperty.property.Type; +import com.stream_pi.action_api.otheractions.CombineAction; +import com.stream_pi.action_api.otheractions.FolderAction; import com.stream_pi.server.uipropertybox.UIPropertyBox; import com.stream_pi.server.client.Client; import com.stream_pi.server.client.ClientProfile; @@ -258,7 +258,7 @@ public class ActionDetailsPane extends V normalActionsPropsVBox = new VBox(displayTextColourHBox, - new HBox(new Label("Alignment"), new SpaceFiller(SpaceFiller.FillerType.HBox), + new HBox(new Label("Alignment"), SpaceFiller.horizontal(), displayTextAlignmentComboBox), new HBoxInputBoxWithFileChooser("Icon", iconFileTextField, hideIconCheckBox, @@ -601,7 +601,7 @@ public class ActionDetailsPane extends V hBox.getChildren().add(helpButton); } - hBox.getChildren().add(new SpaceFiller(SpaceFiller.FillerType.HBox)); + hBox.getChildren().add(SpaceFiller.horizontal()); if(eachProperty.getControlType() == ControlType.COMBO_BOX) { --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPaneListener.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPaneListener.java @@ -1,6 +1,6 @@ package com.stream_pi.server.window.dashboard.actiondetailpane; -import com.stream_pi.actionapi.action.Action; +import com.stream_pi.action_api.action.Action; import com.stream_pi.server.window.dashboard.actiongridpane.ActionBox; import com.stream_pi.util.exception.MinorException; import javafx.stage.Window; --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/CombineActionPropertiesPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/CombineActionPropertiesPane.java @@ -1,8 +1,8 @@ package com.stream_pi.server.window.dashboard.actiondetailpane; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.actionproperty.property.Property; -import com.stream_pi.actionapi.otheractions.CombineAction; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.actionproperty.property.Property; +import com.stream_pi.action_api.otheractions.CombineAction; import com.stream_pi.server.client.ClientProfile; import com.stream_pi.util.exception.MinorException; import javafx.event.ActionEvent; --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnDeleteActionTask.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnDeleteActionTask.java @@ -2,7 +2,7 @@ package com.stream_pi.server.window.dash import java.util.logging.Logger; -import com.stream_pi.actionapi.action.Action; +import com.stream_pi.action_api.action.Action; import com.stream_pi.server.client.ClientProfile; import com.stream_pi.server.connection.ClientConnection; import com.stream_pi.server.window.ExceptionAndAlertHandler; --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.action.ActionType; -import com.stream_pi.actionapi.action.DisplayTextAlignment; -import com.stream_pi.actionapi.actionproperty.ClientProperties; -import com.stream_pi.actionapi.actionproperty.property.Property; -import com.stream_pi.actionapi.actionproperty.property.Type; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.action.ActionType; +import com.stream_pi.action_api.action.DisplayTextAlignment; +import com.stream_pi.action_api.actionproperty.ClientProperties; +import com.stream_pi.action_api.actionproperty.property.Property; +import com.stream_pi.action_api.actionproperty.property.Type; import com.stream_pi.server.client.ClientProfile; import com.stream_pi.server.connection.ClientConnection; import com.stream_pi.server.uipropertybox.UIPropertyBox; --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java @@ -1,9 +1,9 @@ package com.stream_pi.server.window.dashboard.actiongridpane; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.action.ActionType; -import com.stream_pi.actionapi.action.DisplayTextAlignment; -import com.stream_pi.actionapi.action.Location; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.action.ActionType; +import com.stream_pi.action_api.action.DisplayTextAlignment; +import com.stream_pi.action_api.action.Location; import com.stream_pi.server.window.ExceptionAndAlertHandler; import com.stream_pi.server.window.dashboard.actiondetailpane.ActionDetailsPaneListener; import com.stream_pi.util.exception.MinorException; --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java @@ -1,8 +1,8 @@ package com.stream_pi.server.window.dashboard.actiongridpane; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.action.Location; -import com.stream_pi.actionapi.otheractions.FolderAction; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.action.Location; +import com.stream_pi.action_api.otheractions.FolderAction; import com.stream_pi.server.client.Client; import com.stream_pi.server.client.ClientProfile; import com.stream_pi.server.io.Config; --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPaneListener.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPaneListener.java @@ -1,7 +1,7 @@ package com.stream_pi.server.window.dashboard.actiongridpane; -import com.stream_pi.actionapi.action.Action; -import com.stream_pi.actionapi.otheractions.FolderAction; +import com.stream_pi.action_api.action.Action; +import com.stream_pi.action_api.otheractions.FolderAction; public interface ActionGridPaneListener { void addActionToCurrentClientProfile(Action newAction); --- 'a/src/main/java/com/stream_pi/server/window/firsttimeuse/FinalConfigPane.java' +++ b/src/main/java/com/stream_pi/server/window/firsttimeuse/FinalConfigPane.java @@ -6,7 +6,6 @@ import com.stream_pi.server.window.Excep 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 javafx.geometry.Pos; import javafx.scene.control.Alert; @@ -50,7 +49,7 @@ public class FinalConfigPane extends VBo HBox bBar = new HBox(confirmButton); bBar.setAlignment(Pos.CENTER_RIGHT); - getChildren().addAll(label, serverNickNameInputBox, serverPortInputBox, new SpaceFiller(FillerType.VBox), bBar); + getChildren().addAll(label, serverNickNameInputBox, serverPortInputBox, SpaceFiller.vertical(), bBar); setSpacing(10.0); --- 'a/src/main/java/com/stream_pi/server/window/firsttimeuse/FirstTimeUse.java' +++ b/src/main/java/com/stream_pi/server/window/firsttimeuse/FirstTimeUse.java @@ -4,7 +4,6 @@ import com.stream_pi.server.Main; import com.stream_pi.server.connection.ServerListener; import com.stream_pi.server.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; @@ -54,7 +53,7 @@ public class FirstTimeUse extends VBox{ previousButton.setOnAction(event-> onPreviousButtonClicked()); - HBox buttonBar = new HBox(previousButton, new SpaceFiller(FillerType.HBox), nextButton); + HBox buttonBar = new HBox(previousButton, SpaceFiller.horizontal(), nextButton); buttonBar.setSpacing(10.0); getChildren().addAll(headingLabel, stackPane, buttonBar); --- 'a/src/main/java/com/stream_pi/server/window/settings/About.java' +++ b/src/main/java/com/stream_pi/server/window/settings/About.java @@ -1,6 +1,6 @@ package com.stream_pi.server.window.settings; -import com.stream_pi.actionapi.ActionAPI; +import com.stream_pi.action_api.ActionAPI; import com.stream_pi.server.info.License; import com.stream_pi.server.info.ServerInfo; import com.stream_pi.server.Main; --- 'a/src/main/java/com/stream_pi/server/window/settings/ClientsSettings.java' +++ b/src/main/java/com/stream_pi/server/window/settings/ClientsSettings.java @@ -11,7 +11,6 @@ import com.stream_pi.util.exception.Mino 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.platform.ReleaseStatus; import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.concurrent.Task; @@ -479,7 +478,7 @@ public class ClientsSettings extends VBo new HBoxInputBox("Nickname",nicknameTextField), new HBox( new Label("Theme"), - new SpaceFiller(SpaceFiller.FillerType.HBox), + SpaceFiller.horizontal(), themesComboBox ), @@ -488,7 +487,7 @@ public class ClientsSettings extends VBo startupWindowWidthInputBox, new HBox(new Label("Startup Profile"), - new SpaceFiller(SpaceFiller.FillerType.HBox), + SpaceFiller.horizontal(), profilesComboBox), addNewProfileButton, --- 'a/src/main/java/com/stream_pi/server/window/settings/PluginsSettings.java' +++ b/src/main/java/com/stream_pi/server/window/settings/PluginsSettings.java @@ -1,16 +1,15 @@ package com.stream_pi.server.window.settings; import com.stream_pi.server.uipropertybox.UIPropertyBox; -import com.stream_pi.actionapi.actionproperty.property.ControlType; -import com.stream_pi.actionapi.actionproperty.property.Property; -import com.stream_pi.actionapi.actionproperty.property.Type; -import com.stream_pi.actionapi.normalaction.NormalAction; +import com.stream_pi.action_api.actionproperty.property.ControlType; +import com.stream_pi.action_api.actionproperty.property.Property; +import com.stream_pi.action_api.actionproperty.property.Type; +import com.stream_pi.action_api.normalaction.NormalAction; import com.stream_pi.server.action.NormalActionPlugins; import com.stream_pi.server.connection.ServerListener; import com.stream_pi.server.window.ExceptionAndAlertHandler; import com.stream_pi.util.exception.MinorException; import com.stream_pi.util.uihelper.SpaceFiller; -import com.stream_pi.util.uihelper.SpaceFiller.FillerType; import org.kordamp.ikonli.javafx.FontIcon; @@ -215,7 +214,7 @@ public class PluginsSettings extends VBo helpButton.setGraphic(questionIcon); helpButton.setOnAction(event -> hostServices.showDocument(action.getHelpLink())); - headerHBox.getChildren().addAll(new SpaceFiller(FillerType.HBox),helpButton); + headerHBox.getChildren().addAll(SpaceFiller.horizontal() ,helpButton); } @@ -251,7 +250,7 @@ public class PluginsSettings extends VBo Region region = new Region(); HBox.setHgrow(region, Priority.ALWAYS); - HBox hBox = new HBox(label, new SpaceFiller(SpaceFiller.FillerType.HBox)); + HBox hBox = new HBox(label, SpaceFiller.horizontal()); //hBox.setId(j+""); Node controlNode = null; @@ -343,7 +342,7 @@ public class PluginsSettings extends VBo if(action.getButtonBar()!=null) { - HBox buttonBarHBox = new HBox(new SpaceFiller(SpaceFiller.FillerType.HBox), action.getButtonBar()); + HBox buttonBarHBox = new HBox(SpaceFiller.horizontal(), action.getButtonBar()); buttonBarHBox.getStyleClass().add("plugins_settings_each_plugin_button_bar"); vBox.getChildren().add(buttonBarHBox); } --- 'a/src/main/java/com/stream_pi/server/window/settings/ThemesSettings.java' +++ b/src/main/java/com/stream_pi/server/window/settings/ThemesSettings.java @@ -2,8 +2,8 @@ package com.stream_pi.server.window.sett import com.stream_pi.server.controller.Controller; import com.stream_pi.server.io.Config; -import com.stream_pi.themeapi.Theme; -import com.stream_pi.themeapi.Themes; +import com.stream_pi.theme_api.Theme; +import com.stream_pi.theme_api.Themes; import com.stream_pi.util.exception.SevereException; import com.stream_pi.util.uihelper.SpaceFiller; import javafx.application.HostServices; @@ -112,7 +112,7 @@ public class ThemesSettings extends VBox helpButton.setGraphic(questionIcon); helpButton.setOnAction(event -> hostServices.showDocument(theme.getWebsite())); - topRowHBox.getChildren().addAll(new SpaceFiller(SpaceFiller.FillerType.HBox), helpButton); + topRowHBox.getChildren().addAll(SpaceFiller.horizontal(), helpButton); } ToggleButton toggleButton = new ToggleButton(); --- 'a/src/main/java/module-info.java' +++ b/src/main/java/module-info.java @@ -1,10 +1,10 @@ module com.stream_pi.server { - uses com.stream_pi.actionapi.action.Action; - uses com.stream_pi.actionapi.normalaction.NormalAction; + uses com.stream_pi.action_api.action.Action; + uses com.stream_pi.action_api.normalaction.NormalAction; - requires com.stream_pi.actionapi; + requires com.stream_pi.action_api; requires com.stream_pi.util; - requires com.stream_pi.themeapi; + requires com.stream_pi.theme_api; requires org.kordamp.ikonli.javafx;