Author: [log in to unmask]
Date: Thu Mar 12 16:51:15 2015
New Revision: 2424
Log:
Add DISCONNECTING state to ConnectionModel.
Modified:
java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java
java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java
java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java
Modified: java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java
=============================================================================
--- java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java (original)
+++ java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/EventButtonsPanel.java Thu Mar 12 16:51:15 2015
@@ -80,10 +80,19 @@
resumeButton.setEnabled(false);
connectButton.setActionCommand(Commands.CONNECT);
connectButton.setIcon(disconnectedIcon);
- } else {
+ connectButton.setEnabled(true);
+ } else if (status.equals(ConnectionStatus.DISCONNECTING)) {
+ nextButton.setEnabled(false);
+ pauseButton.setEnabled(false);
+ resumeButton.setEnabled(false);
+ connectButton.setEnabled(false);
+ } else if (status.equals(ConnectionStatus.CONNECTED)) {
+ nextButton.setEnabled(false);
pauseButton.setEnabled(true);
+ resumeButton.setEnabled(false);
connectButton.setActionCommand(Commands.DISCONNECT);
connectButton.setIcon(connectedIcon);
+ connectButton.setEnabled(true);
}
}
Modified: java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java
=============================================================================
--- java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java (original)
+++ java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatus.java Thu Mar 12 16:51:15 2015
@@ -10,6 +10,7 @@
public enum ConnectionStatus {
DISCONNECTED(Color.RED),
+ DISCONNECTING(Color.YELLOW),
CONNECTED(Color.GREEN);
Color color;
Modified: java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java
=============================================================================
--- java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java (original)
+++ java/branches/monitoring-app-dev/src/main/java/org/hps/monitoring/application/model/ConnectionStatusModel.java Thu Mar 12 16:51:15 2015
@@ -50,4 +50,16 @@
listener.propertyChange(new PropertyChangeEvent(this, PAUSED_PROPERTY, oldValue, this.paused));
}
}
+
+ public boolean isConnected() {
+ return this.connectionStatus == ConnectionStatus.CONNECTED;
+ }
+
+ public boolean isDisconnected() {
+ return this.connectionStatus == ConnectionStatus.DISCONNECTED;
+ }
+
+ public boolean isDisconnecting() {
+ return this.connectionStatus == ConnectionStatus.DISCONNECTING;
+ }
}
|