Bunch of refactoring

src/main/java/Controll/Controller.java

@@ -74,10 +74,6 @@ public static void setTest(boolean value) {
      * Name of the used file
      */
     private static String fileName = "";
-    /**
-     * Path of the used file
-     */
-    private static String filePath = "";
 
     /**
      * List of the test result
@@ -97,7 +93,7 @@ public static void setTest(boolean value) {
     /**
      * List of the commands
      */
-    public static final List<String> commandList = new ArrayList<>();
+    protected static final List<String> commandList = new ArrayList<>();
 
     /**
      * Number of new pumps with commands
@@ -132,7 +128,7 @@ public static void setActivePlayer(Player p) {
         activePlayers.add(currentPlayer);
     }
 
-    public static Player GetActivePlayer() {
+    public static Player getActivePlayer() {
         return currentPlayer;
     }
 
@@ -155,7 +151,7 @@ public static boolean changeActivePlayer() {
      * Function for controlling the game.
      * Reads a command than calls a function to execute it.
      */
-    public static void Run() {
+    public static void run() {
         while (!commandList.isEmpty()) {
             String command = commandList.get(0);
             commandList.remove(0);
@@ -283,6 +279,7 @@ public static void Game() {
             if (commandList.isEmpty()) {
                 commandList.add(stdInScanner.nextLine());
             }
+            stdInScanner.close();
             String command = commandList.get(0);
             commandList.remove(0);
             String[] cmd = command.split(" ");
@@ -375,22 +372,22 @@ public static void Game() {
                     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;
@@ -399,10 +396,10 @@ public static void Game() {
             }
             if (moves == activePlayers.size()) {
                 moves = 0;
-                endturn(cmd);
+                endturn();
             }
         }
-        Run();
+        run();
     }
 
     /**
@@ -413,7 +410,6 @@ public static void load(String cmd) {
         String modifiedPath = cmd.replace("/", File.separator).replace("\\", File.separator);
         try (Scanner scanner = new Scanner(new File(rootDirectory +  File.separator + modifiedPath));) {
             outResults.clear();
-            filePath = modifiedPath;
             String separator = "\\";
             String[] tmp = cmd.replaceAll(Pattern.quote(separator), "\\\\").split("\\\\");
             fileName = tmp[tmp.length - 1];
@@ -429,7 +425,8 @@ public static void load(String cmd) {
     public static void loadFileFromSrcToReader(String fileNameToOpen) {
         // a text file is located in src folder in the project
         Path rootDir = Paths.get(".").normalize().toAbsolutePath();
-        File file = new File(rootDir.toString() + "/" + fileNameToOpen);
+        Path filePath = rootDir.resolve(fileNameToOpen);
+        File file = filePath.toFile();
         try (Reader input = new FileReader(file)) {
             try (BufferedReader br = new BufferedReader(input)) {
 
@@ -717,11 +714,11 @@ public static void show(String[] cmd) {
         switch (commands[1]) {
             case "player":
                 if (test) outResults.add(p.toString());
-                else logger.log(Level.INFO, p::toString);
+                else logger.log(Level.INFO, p::toString); // Fix: Wrap the method call in a lambda function
                 break;
             case "field":
                 if (test) outResults.add(objectReverseNames.get(p.getStandingField()));
-                else logger.log(Level.INFO, objectReverseNames.get(p.getStandingField()));
+                else logger.log(Level.INFO, () -> objectReverseNames.get(p.getStandingField())); // Fix: Wrap the method call in a lambda function
                 break;
             default:
                 break;
@@ -1163,7 +1160,7 @@ public static void step(String[] cmd) {
      * Function for ending a turn.
      * Responsible for calling the step function for all steppable objects.
      */
-    public static void endturn(String[] cmd) {
+    public static void endturn() {
         //elvégzi a kör végével járó lépéseket (vízszámolás, objektumok step függvényének hívása stb…)
         //vízszámlálás
         //water counter lehet hogy üres
@@ -1181,7 +1178,7 @@ public static void endturn(String[] cmd) {
     /**
      * Function for countig the points for the two sides.
      */
-    public static void count(String[] cmd) {
+    public static void count() {
         waterCounter.count();
         if (test) outResults.add(StringResourceController.GOOD_ACTION);
         else logger.log(Level.INFO, StringResourceController.GOOD_ACTION);
@@ -1190,7 +1187,7 @@ public static void count(String[] cmd) {
     /**
      * Function for restaring the game.
      */
-    public static void restart(String[] cmd) {
+    public static void restart() {
         random = true;
         objectNames.clear();
         objectReverseNames.clear();
@@ -1213,7 +1210,7 @@ public static void test(String[] cmd) {
     /**
      * Function for signaling to the watercounter that the game ended.
      */
-    public static void setend(String[] cmd) {
+    public static void setend() {
         waterCounter.setEnd();
         if (test) outResults.add(StringResourceController.GOOD_ACTION);
         else logger.log(Level.INFO, StringResourceController.GOOD_ACTION);

src/main/java/Controll/Menu.java

@@ -1,16 +1,12 @@
 package main.java.Controll;
 
-import javax.swing.*;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.Color;
 import javax.swing.WindowConstants;
 
-import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.swing.JFrame;
 import javax.swing.JTextField;
 import javax.swing.JButton;
@@ -127,15 +123,15 @@ public JButton getPlayButton() {
         return newGame;
     }
 
-    public ArrayList<JButton> getActionButtons() {
-        ArrayList<JButton> actionButtons = new ArrayList<JButton>();
+    public List<JButton> getActionButtons() {
+        ArrayList<JButton> actionButtons = new ArrayList<>();
         if (vg == null) return actionButtons;
 
-        actionButtons.add(vg.repairButton);
-        actionButtons.add(vg.breakButton);
-        actionButtons.add(vg.makeSlipperyButton);
-        actionButtons.add(vg.makeStickyButton);
-        actionButtons.add(vg.putDownButton);
+        actionButtons.add(ViewGame.repairButton);
+        actionButtons.add(ViewGame.breakButton);
+        actionButtons.add(ViewGame.makeSlipperyButton);
+        actionButtons.add(ViewGame.makeStickyButton);
+        actionButtons.add(ViewGame.putDownButton);
 
         return actionButtons;
     }
@@ -161,7 +157,7 @@ public void actionPerformed(ActionEvent e) {
                     Controller.commandList.add("addplayer D Sab" + i);
                 }
             }
-            Controller.Run(); // egyszer fut le, felépíti a pályát, utána a függvényeit kell majd hívni
+            Controller.run(); // egyszer fut le, felépíti a pályát, utána a függvényeit kell majd hívni
 
             Controller.create();
             Controller.setActivePlayer(Controller.getAllPlayers().get(0));

src/main/java/Drawing/MechanicDraw.java

@@ -40,7 +40,7 @@ public MechanicDraw(int tmpX, int tmpY) {
     @Override
     public void Draw(JPanel panel, Graphics2D g) {
         Mechanic m = (Mechanic)ViewGame.objectDrawNames.get(this);
-        Player current = Controller.GetActivePlayer();
+        Player current = Controller.getActivePlayer();
         mecName = Controller.objectReverseNames.get(m);
         mec.setText(mecName);
         Field f = m.getStandingField();

src/main/java/Drawing/SaboteurDraw.java

@@ -42,7 +42,7 @@ public SaboteurDraw(int tmpX, int tmpY) {
     @Override
     public void Draw(JPanel panel, Graphics2D g) {
         Saboteur s = (Saboteur)ViewGame.objectDrawNames.get(this);
-        Player current = Controller.GetActivePlayer();
+        Player current = Controller.getActivePlayer();
         sabName = Controller.objectReverseNames.get(s);
         sab.setText(sabName);
         Field f = s.getStandingField();

src/main/java/Fields/ActiveFields/Cistern.java

@@ -84,10 +84,10 @@ public Pipe pickUpPipe() {
     @Override
     public String toString() {
         ArrayList<Player> players = this.getPlayers();
-        String playerBuilder = StringResourceController.stingBuilder(players);
+        String playerBuilder = StringResourceController.stringBuilder(players);
 
         ArrayList<Pipe> pipes = this.getPipes();
-        String pipeBuilder = StringResourceController.stingBuilder(pipes);
+        String pipeBuilder = StringResourceController.stringBuilder(pipes);
 
           return "name: "+ Controller.objectReverseNames.get(this)
                   + "\noccupied: " + this.isOccupied()

src/main/java/Fields/ActiveFields/Pump.java

@@ -156,12 +156,12 @@ public String toString() {
 
     private String getPlayerNames() {
         ArrayList<Player> players = this.getPlayers();
-        return StringResourceController.stingBuilder(players);
+        return StringResourceController.stringBuilder(players);
     }
 
 
     private String getPipeNames(){
         ArrayList<Pipe> pipes = this.getPipes();
-        return StringResourceController.stingBuilder(pipes);
+        return StringResourceController.stringBuilder(pipes);
     }
 }

src/main/java/Fields/ActiveFields/Spring.java

@@ -61,11 +61,11 @@ public void step() {
     @Override
     public String toString() {
         ArrayList<Player> players = this.getPlayers();
-        String playerBuilder = StringResourceController.stingBuilder(players);
+        String playerBuilder = StringResourceController.stringBuilder(players);
 
 
         ArrayList<Pipe> pipes = this.getPipes();
-        String pipeBuilder = StringResourceController.stingBuilder(pipes);
+        String pipeBuilder = StringResourceController.stringBuilder(pipes);
 
         return "name: "+ Controller.objectReverseNames.get(this)
                 + "\noccupied: " + this.isOccupied()

src/main/java/Fields/Pipe.java

@@ -342,10 +342,10 @@ public void step(){
     @Override
     public String toString() {
         ArrayList<Player> players = this.getPlayers();
-        String playerBuilder = StringResourceController.stingBuilder(players);
+        String playerBuilder = StringResourceController.stringBuilder(players);
 
         List<ActiveFields> localFields = this.getFields();
-        String fieldBuilder = StringResourceController.stingBuilder(localFields);
+        String fieldBuilder = StringResourceController.stringBuilder(localFields);
         return "name: " + Controller.objectReverseNames.get(this)
                 + "\noccupied: " + this.isOccupied()
                 + "\nwater: " + getWaterNoChange()

src/main/java/StringResource/StringResourceController.java

@@ -13,9 +13,7 @@ private StringResourceController(){}
     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.";
-    public static final String INVALID_ACTION = "A műveletet nem lehet végrehajtani";
-
-    public static String stingBuilder(List collection){
+    public static String stringBuilder(List<?> collection){
         StringBuilder builder = new StringBuilder("null");
         if(collection != null) {
             for (int i = 0; i < collection.size(); i++) {

test/main/java/Fields/ActiveFields/CisternTest.java

@@ -5,7 +5,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Controll.Controller;
 import main.java.Fields.Pipe;
 
 class CisternTest {

test/main/java/StepDefs.java

@@ -9,7 +9,6 @@
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 
-import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -23,7 +22,7 @@ public class StepDefs {
     public void gameInitialized() {
         Controller.load("test/resources/testpalya.txt");
 
-        Controller.Run();
+        Controller.run();
         Controller.create();
         Controller.setActivePlayer(Controller.getAllPlayers().get(0));
     }