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

Added input validation for enabling/disabling GUIs and actions

Browse Source
This commit is contained in:
Marcus Rockwell 2024-09-16 11:49:33 -04:00
parent 66081ea7a6
commit f34be562e9
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
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.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridBagConstraints;
@ -393,7 +394,7 @@ public class SimControlApplication extends TrickApplication implements PropertyC
*/
protected void parseConnectionFromSimList() {
if (runningSimList != null && runningSimList.getSelectedItem() != null) {
if (runningSimList != null && runningSimList.getSelectedItem() != null) {
String selectedStr = runningSimList.getSelectedItem().toString();
// remove the run info if it is shown
int leftPre = selectedStr.indexOf("(");
@ -411,16 +412,16 @@ public class SimControlApplication extends TrickApplication implements PropertyC
String errMsg = "Can't connect! Please provide valid host name and port number separated by : or whitespace!";
printErrorMessage(errMsg);
} else {
host = elements[0].trim();
host = elements[0].trim();
try { port = Integer.parseInt(elements[1].trim()); }
catch (NumberFormatException nfe) {
String errMsg = elements[1] + " is not a valid port number!";
printErrorMessage(errMsg);
String errMsg = elements[1] + " is not a valid port number!";
printErrorMessage(errMsg);
}
}
}
}
}
//========================================
// Set/Get methods
//========================================
@ -465,7 +466,7 @@ public class SimControlApplication extends TrickApplication implements PropertyC
(new RetrieveHostPortTask()).execute();
return;
}
actionController.setVariableServerConnection(commandSimcom);
simState = new SimState();
@ -849,9 +850,8 @@ public class SimControlApplication extends TrickApplication implements PropertyC
statusSimcom.put(status_vars) ;
statusSimcom.put("trick.var_cycle(0.25)\n");
getAction("connect").setEnabled(false);
runningSimList.setEnabled(false);
setActionsEnabled("connect", false);
setGUIEnabled(runningSimList, false);
}
catch (NumberFormatException nfe) {
@ -866,6 +866,14 @@ public class SimControlApplication extends TrickApplication implements PropertyC
}
}
private void setGUIEnabled(Component gui, boolean flag) {
if(gui != null) gui.setEnabled(flag);
}
private void setGUIsEnabled(Component[] guis, boolean flag) {
for(Component gui : guis) setGUIEnabled(gui, flag);
}
/**
* Convenient method for setting the state of specified actions.
*