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

work

Download Browse
+14 −36
Debayan Sutradhar (rnayabed) 2021-02-26 16:02
Debayan Sutradhar (rnayabed) 2021-02-26 16:02
59fe45196a231f1e964a0e7855f9b64761b7a78c
cf7733e487ec4c4e214e691da7c83f18cd3615fb
git #client/59fe45196a231f1e964a0e7855f9b64761b7a78c

Modified Files

List
Side by side diff
M src/main/java/com/stream_pi/client/connection/Client.java
+3 −15
--- 'a/src/main/java/com/stream_pi/client/connection/Client.java'
+++ b/src/main/java/com/stream_pi/client/connection/Client.java
@@ -699,22 +699,10 @@ public class Client extends Thread{
if(acc.getLocation().getCol()!=-1)
{
- String currentParent = clientListener.getCurrentParent();
- if(acc.getParent().equals(currentParent))
- {
- clientListener.clearActionBox(acc.getLocation().getCol(), acc.getLocation().getRow());
- }
-
-
- Platform.runLater(()->{
- try
- {
- clientListener.renderRootDefaultProfile();
- }
- catch (SevereException e)
+ Platform.runLater(()-> {
+ if (clientListener.getCurrentProfile().getID().equals(profileID))
{
- e.printStackTrace();
- exceptionAndAlertHandler.handleSevereException(e);
+ clientListener.renderProfile(clientListener.getCurrentProfile(), false);
}
});
}
M src/main/java/com/stream_pi/client/connection/ClientListener.java
+1 −1
--- 'a/src/main/java/com/stream_pi/client/connection/ClientListener.java'
+++ b/src/main/java/com/stream_pi/client/connection/ClientListener.java
@@ -23,7 +23,7 @@ public interface ClientListener
void setConnected(boolean isConnected);
boolean isConnected();
- void renderProfile(ClientProfile clientProfile);
+ void renderProfile(ClientProfile clientProfile, boolean freshRender);
void clearActionBox(int col, int row);
void addBlankActionBox(int col, int row);
M src/main/java/com/stream_pi/client/controller/Controller.java
+4 −4
--- 'a/src/main/java/com/stream_pi/client/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/client/controller/Controller.java
@@ -312,9 +312,9 @@ public class Controller extends Base
}
@Override
- public void renderProfile(ClientProfile clientProfile) {
+ public void renderProfile(ClientProfile clientProfile, boolean freshRender) {
try {
- getDashboardPane().renderProfile(clientProfile);
+ getDashboardPane().renderProfile(clientProfile, freshRender);
} catch (SevereException e) {
e.printStackTrace();
handleSevereException(e);
@@ -339,7 +339,7 @@ public class Controller extends Base
Platform.runLater(()->{
try {
if(getDashboardPane().getActionGridPane().getCurrentParent().equals(action.getParent()) &&
- getDashboardPane().getActionGridPane().getClientProfile().getID().equals(currentProfileID))
+ getCurrentProfile().getID().equals(currentProfileID))
{
getDashboardPane().getActionGridPane().renderAction(action);
}
@@ -362,7 +362,7 @@ public class Controller extends Base
{
Platform.runLater(()->{
try {
- getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID));
+ getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID), true);
} catch (SevereException e) {
e.printStackTrace();
handleSevereException(e);
M src/main/java/com/stream_pi/client/window/Base.java
+1 −1
--- 'a/src/main/java/com/stream_pi/client/window/Base.java'
+++ b/src/main/java/com/stream_pi/client/window/Base.java
@@ -261,7 +261,7 @@ public abstract class Base extends Stack
{
getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(
Config.getInstance().getStartupProfileID()
- ));
+ ), true);
}
M src/main/java/com/stream_pi/client/window/dashboard/DashboardBase.java
+4 −3
--- 'a/src/main/java/com/stream_pi/client/window/dashboard/DashboardBase.java'
+++ b/src/main/java/com/stream_pi/client/window/dashboard/DashboardBase.java
@@ -44,15 +44,16 @@ public class DashboardBase extends VBox
getStyleClass().add("dashboard");
}
- public void renderProfile(ClientProfile clientProfile) throws SevereException
+ public void renderProfile(ClientProfile clientProfile, boolean freshRender) throws SevereException
{
- renderProfile(clientProfile, "root");
+ renderProfile(clientProfile, "root", freshRender);
}
- public void renderProfile(ClientProfile clientProfile, String currentParent) throws SevereException
+ public void renderProfile(ClientProfile clientProfile, String currentParent, boolean freshRender) throws SevereException
{
actionGridPane.setClientProfile(clientProfile);
actionGridPane.setCurrentParent(currentParent);
+ actionGridPane.setFreshRender(freshRender);
actionGridPane.renderGrid();
actionGridPane.renderActions();
M src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java
+0 −11
--- '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
@@ -261,17 +261,6 @@ public class ActionGridPane extends Grid
public ActionBox getActionBox(int col, int row)
{
return actionBoxes[col][row];
-
- /*for(Node node : getChildren())
- {
- if(GridPane.getColumnIndex(node) == row &&
- GridPane.getRowIndex(node) == col)
- {
- return (ActionBox) node;
- }
- }
-
- return null;*/
}
public ActionBox addBlankActionBox(int col, int row)
M src/main/java/com/stream_pi/client/window/settings/SettingsBase.java
+1 −1
--- 'a/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java'
+++ b/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java
@@ -91,7 +91,7 @@ public class SettingsBase extends VBox {
@Override
public void onNewItemSelected(ClientProfile selectedItem)
{
- clientListener.renderProfile(selectedItem);
+ clientListener.renderProfile(selectedItem, true);
}
});
M src/main/resources/com/stream_pi/client/Default.obj
+- −-
Binary files 'a/src/main/resources/com/stream_pi/client/Default.obj' and b/src/main/resources/com/stream_pi/client/Default.obj differ