server
Clone or download
bug fixes regarding toggle action and handling of invalid action by ActionDetailsPane
Modified Files
--- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java'
+++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java
@@ -377,8 +377,10 @@ public class ClientConnection extends Th
{
try
{
+ logger.info("Sending message with heading "+message.getHeader()+" ...");
oos.writeObject(message);
oos.flush();
+ logger.info("... Done!");
}
catch (IOException e)
{
--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -724,7 +724,6 @@ public class Controller extends Base imp
public void setToggleStatus(boolean currentStatus, String profileID, String actionID, SocketAddress clientSocketAddress)
throws MinorException
{
-
ClientConnection clientConnection = ClientConnections.getInstance().getClientConnectionBySocketAddress(
clientSocketAddress
);
@@ -732,7 +731,6 @@ public class Controller extends Base imp
if(clientConnection == null)
throw new ClientNotFoundException("setToggleStatus failed because no client found with given socket address");
-
new Thread(new Task<Void>() {
@Override
protected Void call()
M
src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java
+54
−37
--- '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
@@ -585,6 +585,16 @@ public class ActionDetailsPane extends V
clientPropertiesVBox.getChildren().clear();
pluginExtraButtonBar.getChildren().clear();
vbox.setVisible(false);
+
+ normalActionsPropsVBox.setVisible(false);
+ toggleActionsPropsVBox.setVisible(false);
+ saveButton.setVisible(false);
+ openFolderButton.setVisible(false);
+ resetToDefaultsFolderButton.setVisible(false);
+ returnButtonForCombineActionChild.setVisible(false);
+ clearIconButton.setVisible(false);
+
+
scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
buttonBar.setVisible(false);
setActionHeadingLabelText("");
@@ -617,11 +627,40 @@ public class ActionDetailsPane extends V
//Combine Child action
isCombineChild = getAction().getLocation().getCol() == -1;
- System.out.println(isCombineChild);
+ displayNameTextField.setText(getAction().getDisplayText());
- System.out.println("DISPLAY : "+getAction().getDisplayText());
+ vbox.setVisible(true);
+ scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+
+ buttonBar.setVisible(true);
+
+
+ displayTextAlignmentComboBox.getSelectionModel().select(getAction().getDisplayTextAlignment());
+
+ if(!getAction().getBgColourHex().isEmpty())
+ actionBackgroundColourPicker.setValue(Color.valueOf(getAction().getBgColourHex()));
+ else
+ actionBackgroundColourTransparentCheckBox.setSelected(true);
- displayNameTextField.setText(getAction().getDisplayText());
+
+
+ if(!getAction().getDisplayTextFontColourHex().isEmpty())
+ displayTextColourPicker.setValue(Color.valueOf(getAction().getDisplayTextFontColourHex()));
+ else
+ displayTextColourDefaultCheckBox.setSelected(true);
+
+
+ hideDisplayTextCheckBox.setSelected(!getAction().isShowDisplayText());
+
+
+ if(getAction().isInvalid())
+ {
+ setActionHeadingLabelText("Invalid action ("+getAction().getModuleName()+")");
+ return;
+ }
+
+
+ saveButton.setVisible(getAction().isInvalid());
if(isCombineChild)
{
@@ -687,57 +726,35 @@ public class ActionDetailsPane extends V
setFolderButtonVisible(getAction().getActionType().equals(ActionType.FOLDER));
setResetToDefaultsFolderButtonVisible(!(getAction().getActionType().equals(ActionType.FOLDER) || getAction().getActionType().equals(ActionType.COMBINE)));
- displayTextAlignmentComboBox.getSelectionModel().select(getAction().getDisplayTextAlignment());
-
- if(!getAction().getBgColourHex().isEmpty())
- actionBackgroundColourPicker.setValue(Color.valueOf(getAction().getBgColourHex()));
- else
- actionBackgroundColourTransparentCheckBox.setSelected(true);
-
-
-
- if(!getAction().getDisplayTextFontColourHex().isEmpty())
- displayTextColourPicker.setValue(Color.valueOf(getAction().getDisplayTextFontColourHex()));
- else
- displayTextColourDefaultCheckBox.setSelected(true);
-
-
- hideDisplayTextCheckBox.setSelected(!getAction().isShowDisplayText());
-
clearIconButton.setDisable(!getAction().isHasIcon());
}
- buttonBar.setVisible(true);
- vbox.setVisible(true);
- scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-
if(getAction().getActionType() == ActionType.NORMAL || getAction().getActionType() == ActionType.TOGGLE)
{
- if(getAction().isInvalid())
- setActionHeadingLabelText("Invalid action ("+getAction().getModuleName()+")");
- else
- setActionHeadingLabelText(getAction().getName());
+ setActionHeadingLabelText(getAction().getName());
}
else if(getAction().getActionType() == ActionType.COMBINE)
+ {
setActionHeadingLabelText("Combine action");
+ }
else if(getAction().getActionType() == ActionType.FOLDER)
+ {
setActionHeadingLabelText("Folder action");
+ }
- if(!getAction().isInvalid())
- {
- if(getAction().getActionType() == ActionType.NORMAL || getAction().getActionType() == ActionType.TOGGLE)
- {
- renderClientProperties();
- renderPluginExtraButtonBar();
- }
- else if(getAction().getActionType() == ActionType.COMBINE)
- renderCombineActionProperties();
+ if(getAction().getActionType() == ActionType.NORMAL || getAction().getActionType() == ActionType.TOGGLE)
+ {
+ renderClientProperties();
+ renderPluginExtraButtonBar();
}
+ else if(getAction().getActionType() == ActionType.COMBINE)
+ renderCombineActionProperties();
+
}
private void renderPluginExtraButtonBar()