ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-03-12 23:44:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored SimControlApplication

Browse Source
This commit is contained in:
Marcus Rockwell 2024-03-20 11:31:01 -05:00
parent d15daf6cb0
commit 6cc93ecb19
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ package trick.simcontrol;
//======================================== //========================================
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Font; import java.awt.Font;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
@ -154,7 +155,7 @@ public class SimControlApplication extends TrickApplication implements PropertyC
/* /*
* The action controller that performs actions for such as clicking button, selection a menu item and etc. * The action controller that performs actions for such as clicking button, selection a menu item and etc.
*/ */
private SimControlActionController actionController; protected SimControlActionController actionController;
// The animation image player panel // The animation image player panel
private AnimationPlayer logoImagePanel; private AnimationPlayer logoImagePanel;
@ -330,17 +331,15 @@ public class SimControlApplication extends TrickApplication implements PropertyC
@Action @Action
public void connect() { public void connect() {
parseHostPortFromInput(); // get host and port from running sim list parseHostPortFromInput(); // get host and port from running sim list
getInitializationPacket(); // init variable server connection getInitializationPacket(); // init variable server connection
if (commandSimcom == null) {
if (commandSimcom == null) {
String errMsg = "Sorry, can't connect. Please make sure the availability of both server and port!"; String errMsg = "Sorry, can't connect. Please make sure the availability of both server and port!";
printErrorMessage(errMsg); printErrorMessage(errMsg);
return; return;
} }
setEnabledAllActions(true); // enable all actions setEnabledAllActions(true); // enable all actions
scheduleGetSimState(); // set up the sim status variables scheduleGetSimState(); // set up the sim status variables
startStatusMonitors(); // start monitors for sim and health status startStatusMonitors(); // start monitors for sim and health status
} }
@ -360,7 +359,10 @@ public class SimControlApplication extends TrickApplication implements PropertyC
* Sets all actions as either enabled or disabled * Sets all actions as either enabled or disabled
* @param isEnabled the state to set each action as * @param isEnabled the state to set each action as
*/ */
private void setEnabledAllActions(bool isEnabled) { private void setEnabledAllActions(boolean isEnabled) {
if(actionMap == null)
return;
Object[] keys = actionMap.allKeys(); Object[] keys = actionMap.allKeys();
// If there is a server connection established, enable all actions. // If there is a server connection established, enable all actions.
for (int i = 0; i < keys.length; i++) { for (int i = 0; i < keys.length; i++) {
@ -373,8 +375,6 @@ public class SimControlApplication extends TrickApplication implements PropertyC
* Parse the host and port from the runningSimList object * Parse the host and port from the runningSimList object
*/ */
protected void parseHostPortFromInput() { protected void parseHostPortFromInput() {
String hostname = "";
int portNum = -1;
if (runningSimList != null && runningSimList.getSelectedItem() != null) { if (runningSimList != null && runningSimList.getSelectedItem() != null) {
String selectedStr = runningSimList.getSelectedItem().toString(); String selectedStr = runningSimList.getSelectedItem().toString();
@ -394,16 +394,14 @@ public class SimControlApplication extends TrickApplication implements PropertyC
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);
} else { } else {
hostname = elements[0].trim(); host = elements[0].trim();
try { portNum = Integer.parseInt(elements[1].trim()); } try { 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);
} }
} }
} }
setHostPort(hostname, portNum);
} }
//======================================== //========================================
@ -543,7 +541,7 @@ public class SimControlApplication extends TrickApplication implements PropertyC
} }
} }
protected void setHostPort(String hostname, int portNum) { public void setHostPort(String hostname, int portNum) {
host = hostname; host = hostname;
port = portNum; port = portNum;
} }
@ -819,9 +817,8 @@ public class SimControlApplication extends TrickApplication implements PropertyC
statusSimcom.put(status_vars) ; statusSimcom.put(status_vars) ;
statusSimcom.put("trick.var_cycle(0.25)\n"); statusSimcom.put("trick.var_cycle(0.25)\n");
setActionsEnabled("connect", false);
getAction("connect").setEnabled(false); setGUIEnabled(runningSimList, false);
runningSimList.setEnabled(false);
} }
catch (NumberFormatException nfe) { catch (NumberFormatException nfe) {
@ -836,6 +833,14 @@ public class SimControlApplication extends TrickApplication implements PropertyC
} }
} }
private void setGUIEnabled(Component gui, boolean flag) {
if(gui != null) gui.setEnabled(flag);
}
private void setGUIEnabled(Component[] guis, boolean flag) {
for(Component gui : guis) setGUIEnabled(gui, flag);
}
/** /**
* Convenient method for setting the state of specified actions. * Convenient method for setting the state of specified actions.
* *