Skip to content

Commit d93f0e9

Browse files
committed
update
add textField red borders in case of validation error
1 parent 3f83812 commit d93f0e9

File tree

6 files changed

+43
-3
lines changed

6 files changed

+43
-3
lines changed

bin/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
/view/
2+
/networking/
3+
/controller/

bin/controller/Controller.class

264 Bytes
Binary file not shown.

bin/networking/ServerStream.class

0 Bytes
Binary file not shown.

src/controller/Controller.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,15 @@ public void initialize()
330330
{
331331
this.buttonCNR.setDisable(false);
332332
this.labelErrorNicknameS.setVisible(false);
333+
this.buttonCNR.setDisable(true);
334+
this.textFieldNicknameS.setStyle("-fx-border-width: 0px; -fx-focus-color: #039ED3;");
333335
}
334336
// nickname NOT
335337
else
336338
{
337339
this.buttonCNR.setDisable(true);
338340
this.labelErrorNicknameS.setVisible(true);
341+
this.textFieldNicknameS.setStyle("-fx-text-box-border: red; -fx-focus-color: red;");
339342
}
340343
}
341344
@FXML public void increaseMinRoom(MouseEvent event)
@@ -456,27 +459,44 @@ public void initialize()
456459
this.buttonJER.setDisable(false);
457460
this.labelErrorNicknameC.setVisible(false);
458461
this.labelErrorIP.setVisible(false);
462+
// reset borders & focus (nickname)
463+
this.textFieldNicknameC.setStyle("-fx-border-width: 0px; -fx-focus-color: #039ED3;");
464+
// reset borders & focus (address)
465+
this.textFieldIP.setStyle("-fx-border-width: 0px; -fx-focus-color: #039ED3;");
459466
}
460467
// nickname OK & address NOT (nor empty)
461468
else if(this.checkNickname(this.textFieldNicknameC.getText()) && !(checkIP(this.textFieldIP.getText()) || this.textFieldIP.getText().isEmpty()))
462469
{
463470
this.buttonJER.setDisable(true);
464471
this.labelErrorNicknameC.setVisible(false);
465472
this.labelErrorIP.setVisible(true);
473+
// reset borders & focus (nickname)
474+
this.textFieldNicknameC.setStyle("-fx-border-width: 0px; -fx-focus-color: #039ED3;");
475+
// reset borders & focus (address)
476+
this.textFieldIP.setStyle("-fx-text-box-border: red; -fx-focus-color: red;");
466477
}
467478
// nickname NOT & address OK (or empty)
468479
else if(!this.checkNickname(this.textFieldNicknameC.getText()) && (checkIP(this.textFieldIP.getText()) || this.textFieldIP.getText().isEmpty()))
469480
{
470481
this.buttonJER.setDisable(true);
471482
this.labelErrorNicknameC.setVisible(true);
472483
this.labelErrorIP.setVisible(false);
484+
// red borders & focus (nickname)
485+
this.textFieldNicknameC.setStyle("-fx-text-box-border: red; -fx-focus-color: red;");
486+
// reset borders & focus (address)
487+
this.textFieldIP.setStyle("-fx-border-width: 0px; -fx-focus-color: #039ED3;");
473488
}
474489
// nickname NOT & address NOT (nor empty)
475490
else
476491
{
477492
this.buttonJER.setDisable(true);
478493
this.labelErrorNicknameC.setVisible(true);
479494
this.labelErrorIP.setVisible(true);
495+
// red borders & focus (nickname)
496+
this.textFieldNicknameC.setStyle("-fx-text-box-border: red; -fx-focus-color: red;");
497+
// red borders & focus (address)
498+
this.textFieldIP.setStyle("-fx-text-box-border: red; -fx-focus-color: red;");
499+
480500
}
481501
}
482502
@FXML public void joinExistingRoom(ActionEvent event)
@@ -690,12 +710,12 @@ else if(!this.checkNickname(this.textFieldNicknameC.getText()) && (checkIP(this.
690710
}
691711

692712
// utilities
693-
private boolean checkNickname(String text)
713+
public boolean checkNickname(String text)
694714
{
695715
// if OK return true
696716
return PATTERN_NICKNAME.matcher(text).matches() ? true : false;
697717
}
698-
private boolean checkIP(String text)
718+
public boolean checkIP(String text)
699719
{
700720
// if OK return true
701721
return PATTERN_IP.matcher(text).matches() ? true : false;

src/networking/IServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
public interface IServer {
66
public void sendChatMessage(String content);
7-
public void sendKickUser(String nickname);
7+
public void sendKickUser(String kickNickname);
88
public User sendBanUser(String banNickname);
9+
//public boolean sendBanUser(String banNickname, String banAddress);
910
public boolean removeBan(String address);
1011
public boolean checkCanStartGame();
1112
public void sendClose();

src/networking/ServerStream.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,23 @@ public User sendBanUser(String banNickname)
390390
return result;
391391
}
392392

393+
/*@Override
394+
public boolean sendBanUser(String banNickname, String banAddress)
395+
{
396+
if(!this.controller.checkNickname(banNickname) || !this.controller.checkIP(banAddress))
397+
return false;
398+
399+
for(User u : this.bannedUsers)
400+
{
401+
if(banNickname.equals(u.getNickname()) && banAddress.equals(u.getAddress().getHostAddress()))
402+
}
403+
if(!this.bannedUsers.contains(this.bannedUsers.contains()))
404+
{
405+
return true;
406+
}
407+
return false;
408+
}*/
409+
393410
@Override
394411
public boolean removeBan(String address)
395412
{

0 commit comments

Comments
 (0)