FIx: case sensitive
This commit is contained in:
@@ -4,6 +4,9 @@ import it.polimi.ingsw.gc14.Network.NetworkEvent;
|
||||
import it.polimi.ingsw.gc14.Network.RMI.Client.RMIClient;
|
||||
import it.polimi.ingsw.gc14.Network.TCP.Client.TCPClient;
|
||||
import it.polimi.ingsw.gc14.View.TUI.TUI;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Scanner;
|
||||
|
||||
/**
|
||||
@@ -14,6 +17,8 @@ import java.util.Scanner;
|
||||
*/
|
||||
public class ClientLauncherTUI {
|
||||
|
||||
List<String> admissibleChar=new ArrayList<>();
|
||||
|
||||
/**
|
||||
* The TUI view associated with this client.
|
||||
*/
|
||||
@@ -29,6 +34,23 @@ public class ClientLauncherTUI {
|
||||
*/
|
||||
public void main() throws InterruptedException {
|
||||
view = new TUI(null);
|
||||
admissibleChar.add("0");
|
||||
admissibleChar.add("1");
|
||||
admissibleChar.add("2");
|
||||
admissibleChar.add("3");
|
||||
admissibleChar.add("4");
|
||||
admissibleChar.add("5");
|
||||
admissibleChar.add("6");
|
||||
admissibleChar.add("7");
|
||||
admissibleChar.add("8");
|
||||
admissibleChar.add("9");
|
||||
admissibleChar.add("A");
|
||||
admissibleChar.add("B");
|
||||
admissibleChar.add("C");
|
||||
admissibleChar.add("a");
|
||||
admissibleChar.add("b");
|
||||
admissibleChar.add("c");
|
||||
|
||||
ClientController controller = new ClientController(view);
|
||||
Scanner scanner = new Scanner(System.in);
|
||||
System.out.println("Insert username: ");
|
||||
@@ -103,6 +125,9 @@ public class ClientLauncherTUI {
|
||||
private void getInput(Scanner scanner, ClientController controller, String username) {
|
||||
String action = scanner.next();
|
||||
int pos = -1;
|
||||
|
||||
if(admissibleChar.contains(username))
|
||||
{
|
||||
if (!action.equals("7") && !action.equals("8") && !action.equals("9") && !action.equals("A") && !action.equals("B") && !action.equals("C")) {
|
||||
try {
|
||||
System.out.println("Insert the required position:");
|
||||
@@ -122,10 +147,15 @@ public class ClientLauncherTUI {
|
||||
case "7" -> controller.noOptionalCard(username);
|
||||
case "8" -> controller.skipUpper(username);
|
||||
case "9" -> controller.skipLower(username);
|
||||
case "A" -> view.fullRender();
|
||||
case "B" -> view.renderBoard();
|
||||
case "C" -> view.renderPlayer();
|
||||
case "A", "a" -> view.fullRender();
|
||||
case "B", "b" -> view.renderBoard();
|
||||
case "C", "c" -> view.renderPlayer();
|
||||
default -> {}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.out.println("ERROR: Invalid input(action not valid)");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user