Fixed invalid signature

BME-MIT-IET · May 22, 2024 · b3ea4e4 · b3ea4e4
1 parent 3b6075a
commit b3ea4e4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/Controll/Controller.java b/src/main/java/Controll/Controller.java
@@ -242,22 +242,22 @@ public static void run() {
                     step(cmd);
                     break;
                 case ("endturn"):
-                    endturn(cmd);
+                    endturn();
                     break;
                 case ("count"):
-                    count(cmd);
+                    count();
                     break;
                 case ("test"):
                     test(cmd);
                     break;
                 case ("setend"):
-                    setend(cmd);
+                    setend();
                     break;
                 case ("setpump"):
                     setpump(cmd);
                     break;
                 case ("restart"):
-                    restart(cmd);
+                    restart();
                     break;
                 case ("exit"):
                     return;

diff --git a/src/main/java/Controll/ViewGame.java b/src/main/java/Controll/ViewGame.java
@@ -321,7 +321,7 @@ public void actionPerformed(ActionEvent e) {
         }
         if(e.getSource() == putDownButton){
         	cmd[1] = Controller.getActivePlayerName();
-        	if(Controller.GetActivePlayer().getStandingField() instanceof Pipe) Controller.placepump(cmd);
+        	if(Controller.getActivePlayer().getStandingField() instanceof Pipe) Controller.placepump(cmd);
         	else Controller.connect(cmd);
         	successful = true;
         }
@@ -339,13 +339,13 @@ public static void changeText(String[] cmd){
         boolean b = Controller.changeActivePlayer();
         activePlayer.setText("Active Player: " + Controller.getActivePlayerName());
         if (b) {
-            Controller.endturn(cmd);
+            Controller.endturn();
             mecPoints.setText("Mechanic: " + Controller.waterCounter.getMechanic());
             sabPoints.setText("Saboteur: " + Controller.waterCounter.getSaboteur());
             ++round;
             if(round == maxRounds){
-                Controller.setend(cmd);
-                Controller.endturn(cmd);
+                Controller.setend();
+                Controller.endturn();
                 mecPoints.setText("Mechanic: " + Controller.waterCounter.getMechanic());
                 sabPoints.setText("Saboteur: " + Controller.waterCounter.getSaboteur());
                 vg.THE_END();

diff --git a/src/main/java/StringResource/StringResourceController.java b/src/main/java/StringResource/StringResourceController.java
@@ -10,6 +10,7 @@ private StringResourceController(){}
     public static final String FILE_NOT_FOUND = "File not found";
     public static final String WRONG_PLAYER = "Nem te vagy a soron következő játékos!";
     public static final String WRONG_ACTION = "Sikertelen művelet";
+    public static final String INVALID_ACTION = "A műveletet nem lehet végrehajtani";
     public static final String GOOD_ACTION = "Sikeres művelet";
     public static final String WATER = "water";
     public static final String RANDOM_ON = "A véletlen események be lettek kapcsolva.";