ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-11 05:01:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorganized Connect function to shorten it and increase readability

Browse Source
This commit is contained in:
Marcus Rockwell 2024-09-16 11:46:53 -04:00
parent 28bece6065
commit 66081ea7a6
1 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java
View File

@ -347,7 +347,52 @@ public class SimControlApplication extends TrickApplication implements PropertyC
*/ */
@Action @Action
public void connect() { public void connect() {
// get host and port for selected sim parseConnectionFromSimList(); // get host and port from running sim list
getInitializationPacket(); // init variable server connection
if (commandSimcom == null) {
String errMsg = "Sorry, can't connect. Please make sure the availability of both server and port!";
printErrorMessage(errMsg);
return;
}
setEnabledAllActions(true); // enable all actions
scheduleGetSimState(); // set up the sim status variables
startStatusMonitors(); // start monitors for sim and health status
}
/**
* Helper method for starting monitors for sim status as well as health status.
*/
protected void startStatusMonitors() {
MonitorSimStatusTask monitorSimStatusTask = new MonitorSimStatusTask(this);
monitorSimStatusTask.addPropertyChangeListener(this);
getContext().getTaskService().execute(monitorSimStatusTask);
// For receiving hs messages.
getContext().getTaskService().execute(new MonitorHealthStatusTask(this));
}
/**
* Sets all actions as either enabled or disabled
* @param isEnabled the state to set each action as
*/
protected void setEnabledAllActions(boolean isEnabled) {
if(actionMap == null)
return;
Object[] keys = actionMap.allKeys();
// If there is a server connection established, enable all actions.
for (int i = 0; i < keys.length; i++) {
String theKey = (String)keys[i];
getAction(theKey).setEnabled(isEnabled);
}
}
/**
* Parse the host and port from the runningSimList object
*/
protected void parseConnectionFromSimList() {
if (runningSimList != null && runningSimList.getSelectedItem() != null) { if (runningSimList != null && runningSimList.getSelectedItem() != null) {
String selectedStr = runningSimList.getSelectedItem().toString(); String selectedStr = runningSimList.getSelectedItem().toString();
// remove the run info if it is shown // remove the run info if it is shown
@ -365,49 +410,15 @@ public class SimControlApplication extends TrickApplication implements PropertyC
if (elements == null || elements.length < 2) { if (elements == null || elements.length < 2) {
String errMsg = "Can't connect! Please provide valid host name and port number separated by : or whitespace!"; String errMsg = "Can't connect! Please provide valid host name and port number separated by : or whitespace!";
printErrorMessage(errMsg); printErrorMessage(errMsg);
return; } else {
}
host = elements[0].trim(); host = elements[0].trim();
try { try { port = Integer.parseInt(elements[1].trim()); }
port = Integer.parseInt(elements[1].trim()); catch (NumberFormatException nfe) {
} catch (NumberFormatException nfe) {
String errMsg = elements[1] + " is not a valid port number!"; String errMsg = elements[1] + " is not a valid port number!";
printErrorMessage(errMsg); printErrorMessage(errMsg);
return; }
}
} }
getInitializationPacket();
if (commandSimcom == null) {
String errMsg = "Sorry, can't connect. Please make sure the availability of both server and port!";
printErrorMessage(errMsg);
return;
} else {
Object[] keys = actionMap.allKeys();
// If there is a server connection established, enable all actions.
for (int i = 0; i < keys.length; i++) {
String theKey = (String)keys[i];
getAction(theKey).setEnabled(true);
}
} }
scheduleGetSimState();
startStatusMonitors();
}
/**
* Helper method for starting monitors for sim status as well as health status.
*/
private void startStatusMonitors() {
MonitorSimStatusTask monitorSimStatusTask = new MonitorSimStatusTask(this);
monitorSimStatusTask.addPropertyChangeListener(this);
getContext().getTaskService().execute(monitorSimStatusTask);
// For receiving hs messages.
getContext().getTaskService().execute(new MonitorHealthStatusTask(this));
} }
//======================================== //========================================