Public

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

client

Clone or download

Refactored, removed old proto files

Download Browse
+36 −100
Debayan Sutradhar (rnayabed) 2021-02-09 20:01
Debayan Sutradhar (rnayabed) 2021-02-09 20:01
0d39bb232652babafaff0fe5359255c8867730c6
e023760afc1dd31f844d4ef005a5d36d9f59b1f5
git #client/0d39bb232652babafaff0fe5359255c8867730c6

Modified Files

List
Side by side diff
M pom.xml
+1 −1
--- 'a/pom.xml'
+++ b/pom.xml
@@ -56,7 +56,7 @@
<version>${theme.api.version}</version>
</dependency>
<dependency>
- <groupId>com.stream_pi</groupId>
+ <groupId>com.stream-pi</groupId>
<artifactId>util</artifactId>
<version>${util.version}</version>
</dependency>
M src/main/java/com/stream_pi/client/connection/Client.java
+8 −8
--- 'a/src/main/java/com/stream_pi/client/connection/Client.java'
+++ b/src/main/java/com/stream_pi/client/connection/Client.java
@@ -1,18 +1,18 @@
package com.stream_pi.client.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.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.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;
M src/main/java/com/stream_pi/client/connection/ClientListener.java
+3 −3
--- 'a/src/main/java/com/stream_pi/client/connection/ClientListener.java'
+++ b/src/main/java/com/stream_pi/client/connection/ClientListener.java
@@ -1,11 +1,11 @@
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.themeapi.Themes;
+import com.stream_pi.theme_api.Theme;
+import com.stream_pi.theme_api.Themes;
import com.stream_pi.util.exception.SevereException;
public interface ClientListener {
D src/main/java/com/stream_pi/client/connection/protos/ClientConnectionProtos.proto
+0 −49
--- 'a/src/main/java/com/stream_pi/client/connection/protos/ClientConnectionProtos.proto'
+++ /dev/null
@@ -1,49 +0,0 @@
-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
--- 'a/src/main/java/com/stream_pi/client/connection/protos/ClientGRPC.proto'
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-{
-
-}
\ No newline at end of file
M src/main/java/com/stream_pi/client/controller/Controller.java
+1 −1
--- 'a/src/main/java/com/stream_pi/client/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/client/controller/Controller.java
@@ -1,6 +1,6 @@
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;
M src/main/java/com/stream_pi/client/profile/ClientProfile.java
+7 −7
--- 'a/src/main/java/com/stream_pi/client/profile/ClientProfile.java'
+++ b/src/main/java/com/stream_pi/client/profile/ClientProfile.java
@@ -18,13 +18,13 @@ 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.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.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.client.info.ClientInfo;
import com.stream_pi.util.exception.MinorException;
import com.stream_pi.util.version.Version;
M src/main/java/com/stream_pi/client/window/Base.java
+2 −2
--- 'a/src/main/java/com/stream_pi/client/window/Base.java'
+++ b/src/main/java/com/stream_pi/client/window/Base.java
@@ -12,8 +12,8 @@ import com.stream_pi.client.profile.Clie
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.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.combobox.StreamPiComboBox;
import com.stream_pi.util.exception.MinorException;
M src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java
+3 −3
--- 'a/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java'
+++ b/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java
@@ -1,8 +1,8 @@
package com.stream_pi.client.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.action_api.action.Action;
+import com.stream_pi.action_api.action.ActionType;
+import com.stream_pi.action_api.action.DisplayTextAlignment;
import com.stream_pi.client.window.ExceptionAndAlertHandler;
import javafx.animation.Interpolator;
import javafx.animation.KeyFrame;
M src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java
+2 −2
--- 'a/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java'
+++ b/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java
@@ -2,8 +2,8 @@ package com.stream_pi.client.window.dash
import java.util.logging.Logger;
-import com.stream_pi.actionapi.action.Action;
-import com.stream_pi.actionapi.action.Location;
+import com.stream_pi.action_api.action.Action;
+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;
M src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPaneListener.java
+2 −2
--- 'a/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPaneListener.java'
+++ b/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPaneListener.java
@@ -1,7 +1,7 @@
package com.stream_pi.client.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 {
M src/main/java/com/stream_pi/client/window/firsttimeuse/FinalConfigPane.java
+1 −2
--- 'a/src/main/java/com/stream_pi/client/window/firsttimeuse/FinalConfigPane.java'
+++ b/src/main/java/com/stream_pi/client/window/firsttimeuse/FinalConfigPane.java
@@ -9,7 +9,6 @@ import com.stream_pi.util.alert.StreamPi
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;
@@ -76,7 +75,7 @@ public class FinalConfigPane extends VBo
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);
M src/main/java/com/stream_pi/client/window/firsttimeuse/FirstTimeUse.java
+1 −2
--- 'a/src/main/java/com/stream_pi/client/window/firsttimeuse/FirstTimeUse.java'
+++ b/src/main/java/com/stream_pi/client/window/firsttimeuse/FirstTimeUse.java
@@ -4,7 +4,6 @@ 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;
@@ -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.getStyleClass().add("first_time_use_pane_button_bar");
buttonBar.setSpacing(10.0);
M src/main/java/com/stream_pi/client/window/settings/SettingsBase.java
+3 −3
--- 'a/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java'
+++ b/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java
@@ -7,7 +7,7 @@ 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;
@@ -161,12 +161,12 @@ public class SettingsBase extends VBox {
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,
M src/main/java/module-info.java
+2 −2
--- 'a/src/main/java/module-info.java'
+++ b/src/main/java/module-info.java
@@ -11,8 +11,8 @@ module com.stream_pi.client {
requires java.xml;
requires com.stream_pi.util;
- requires com.stream_pi.actionapi;
- requires com.stream_pi.themeapi;
+ requires com.stream_pi.theme_api;
+ requires com.stream_pi.action_api;
requires org.kordamp.ikonli.fontawesome5;