michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validation fixed on server list screen.

Browse Source 
Server List Screen done.
tags : #story[1245]
This commit is contained in:
Alistair McIntyre
2017-09-11 13:51:29 +12:00
parent 800ae2864f
commit 2b53e0d5b4
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/ServerListController.java
+12 -6
View File
@@ -72,8 +72,8 @@ public class ServerListController implements Initializable, ServerListenerDelega
RequiredFieldValidator validator = new RequiredFieldValidator();
textField.getValidators().add(validator);
}
serverHostName.getValidators().get(0).setMessage("Correct HostName Required");
serverPortNumber.getValidators().get(0).setMessage("Correct Port Number Required");
serverHostName.getValidators().get(0).setMessage("Incorrect Host Name");
serverPortNumber.getValidators().get(0).setMessage("Incorrect Port Number");
// Start listening for servers on network
try {
@@ -112,11 +112,18 @@ public class ServerListController implements Initializable, ServerListenerDelega
*
*/
private void attemptToDirectConnect() {
if (validateHostName(serverHostName.getText()) && validatePortNumber(serverPortNumber.getText())) {
if (validateDirectConnection(serverHostName.getText(), serverPortNumber.getText())) {
DirectConnect();
}
}
private Boolean validateDirectConnection(String hostName, String portNumber) {
Boolean hostNameValid = validateHostName(hostName);
Boolean portNumberValid = validatePortNumber(portNumber);
return hostNameValid && portNumberValid;
}
/**
*
* @return
@@ -149,13 +156,12 @@ public class ServerListController implements Initializable, ServerListenerDelega
if (portNum > 1024 && portNum <= 65536) {
return true;
} else {
System.out.println(portNum.toString() + "is not a valid port number");
serverPortNumber.validate();
System.out.println(portNum.toString() + " is not a valid port number");
}
} catch (NumberFormatException e) {
serverPortNumber.validate();
System.out.println("Not a valid number.");
}
serverPortNumber.validate();
return false;
}