Merge pull request #17 from BME-MIT-IET/fixes

Refactoring and fixes
BME-MIT-IET · May 22, 2024 · 3f5ddc6 · 3f5ddc6
2 parents d2769ea + 5824aa4
commit 3f5ddc6
Show file tree

Hide file tree

Showing 33 changed files with 192 additions and 192 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,10 +2,7 @@ name: SonarCloud
 on:
   push:
     branches:
-      - main
-      - Manuális-és-statikus-ellenőrzés
-      - Sonar-Fixes
-      - maven
+      - '**'
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

diff --git a/src/main/java/Drawing/CisternDraw.java b/src/main/java/Drawing/CisternDraw.java
@@ -1,8 +1,9 @@
-package main.java.Drawing;
-
-import main.java.Controll.ViewGame;
+package main.java.drawing;
 
 import javax.swing.*;
+
+import main.java.control.ViewGame;
+
 import java.awt.*;
 
 /**

diff --git a/src/main/java/Drawing/Drawable.java b/src/main/java/Drawing/Drawable.java
@@ -1,4 +1,4 @@
-package main.java.Drawing;
+package main.java.drawing;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/src/main/java/Drawing/MechanicDraw.java b/src/main/java/Drawing/MechanicDraw.java
@@ -1,14 +1,14 @@
-package main.java.Drawing;
+package main.java.drawing;
 
-import main.java.Controll.Controller;
-import main.java.Controll.ViewGame;
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.ActiveFields.Spring;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Players.Mechanic;
-import main.java.Players.Player;
+import main.java.control.Controller;
+import main.java.control.ViewGame;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
+import main.java.fields.activefields.Spring;
+import main.java.players.Mechanic;
+import main.java.players.Player;
 
 import javax.swing.*;
 import java.awt.*;
@@ -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();

diff --git a/src/main/java/Drawing/PipeDraw.java b/src/main/java/Drawing/PipeDraw.java
@@ -1,8 +1,9 @@
-package main.java.Drawing;
-
-import main.java.Controll.ViewGame;
+package main.java.drawing;
 
 import javax.swing.*;
+
+import main.java.control.ViewGame;
+
 import java.awt.*;
 
 /**

diff --git a/src/main/java/Drawing/PumpDraw.java b/src/main/java/Drawing/PumpDraw.java
@@ -1,7 +1,7 @@
-package main.java.Drawing;
+package main.java.drawing;
 
-import main.java.Controll.ViewGame;
-import main.java.Fields.ActiveFields.Pump;
+import main.java.control.ViewGame;
+import main.java.fields.activefields.Pump;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/src/main/java/Drawing/SaboteurDraw.java b/src/main/java/Drawing/SaboteurDraw.java
@@ -1,14 +1,14 @@
-package main.java.Drawing;
+package main.java.drawing;
 
-import main.java.Controll.Controller;
-import main.java.Controll.ViewGame;
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.ActiveFields.Spring;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.Players.Saboteur;
+import main.java.control.Controller;
+import main.java.control.ViewGame;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
+import main.java.fields.activefields.Spring;
+import main.java.players.Player;
+import main.java.players.Saboteur;
 
 import javax.swing.*;
 import java.awt.*;
@@ -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();

diff --git a/src/main/java/Drawing/SpringDraw.java b/src/main/java/Drawing/SpringDraw.java
@@ -1,8 +1,9 @@
-package main.java.Drawing;
-
-import main.java.Controll.ViewGame;
+package main.java.drawing;
 
 import javax.swing.*;
+
+import main.java.control.ViewGame;
+
 import java.awt.*;
 
 public class SpringDraw extends Drawable {

diff --git a/src/main/java/Enums/Fluid.java b/src/main/java/Enums/Fluid.java
@@ -1,4 +1,4 @@
-package main.java.Enums;
+package main.java.enums;
 
 public enum Fluid {
     DRY, STICKY, SLIPPERY

diff --git a/src/main/java/Fields/ActiveFields/ActiveFields.java b/src/main/java/Fields/ActiveFields/ActiveFields.java
@@ -1,8 +1,8 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.players.Player;
 
 import java.util.ArrayList;
 

diff --git a/src/main/java/Fields/ActiveFields/Cistern.java b/src/main/java/Fields/ActiveFields/Cistern.java
@@ -1,9 +1,9 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Controll.Controller;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -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()

diff --git a/src/main/java/Fields/ActiveFields/Pump.java b/src/main/java/Fields/ActiveFields/Pump.java
@@ -1,9 +1,9 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Controll.Controller;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -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);
     }
 }
diff --git a/src/main/java/Fields/ActiveFields/Spring.java b/src/main/java/Fields/ActiveFields/Spring.java
@@ -1,9 +1,9 @@
-package main.java.Fields.ActiveFields;
+package main.java.fields.activefields;
 
-import main.java.Controll.Controller;
-import main.java.Fields.Pipe;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 
@@ -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()

diff --git a/src/main/java/Fields/Field.java b/src/main/java/Fields/Field.java
@@ -1,9 +1,9 @@
-package main.java.Fields;
+package main.java.fields;
 
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Interfaces.Steppable;
-import main.java.Players.Player;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
+import main.java.interfaces.Steppable;
+import main.java.players.Player;
 
 import java.util.ArrayList;
 

diff --git a/src/main/java/Fields/Pipe.java b/src/main/java/Fields/Pipe.java
@@ -1,11 +1,11 @@
-package main.java.Fields;
+package main.java.fields;
 
-import main.java.Controll.Controller;
-import main.java.Enums.Fluid;
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Players.Player;
-import main.java.StringResource.StringResourceController;
+import main.java.control.Controller;
+import main.java.enums.Fluid;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
+import main.java.players.Player;
+import main.java.stringresource.StringResourceController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -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()

diff --git a/src/main/java/Interfaces/Steppable.java b/src/main/java/Interfaces/Steppable.java
@@ -1,4 +1,4 @@
-package main.java.Interfaces;
+package main.java.interfaces;
 
 /**
  * Steppable interface.

diff --git a/src/main/java/Players/Mechanic.java b/src/main/java/Players/Mechanic.java
@@ -1,9 +1,9 @@
-package main.java.Players;
+package main.java.players;
 
-import main.java.Controll.Controller;
-import main.java.Fields.ActiveFields.ActiveFields;
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.Pipe;
+import main.java.control.Controller;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
 
 
 /**

diff --git a/src/main/java/Players/Player.java b/src/main/java/Players/Player.java
@@ -1,8 +1,8 @@
-package main.java.Players;
+package main.java.players;
 
-import main.java.Fields.ActiveFields.Pump;
-import main.java.Fields.Field;
-import main.java.Fields.Pipe;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Pump;
 
 /**
  * Abstract class for the players.

diff --git a/src/main/java/Players/Saboteur.java b/src/main/java/Players/Saboteur.java
@@ -1,6 +1,6 @@
-package main.java.Players;
+package main.java.players;
 
-import main.java.Controll.Controller;
+import main.java.control.Controller;
 
 
 /**

diff --git a/src/main/java/StringResource/StringResourceController.java b/src/main/java/StringResource/StringResourceController.java
@@ -1,21 +1,20 @@
-package main.java.StringResource;
-
-import main.java.Controll.Controller;
+package main.java.stringresource;
 
 import java.util.List;
 
+import main.java.control.Controller;
+
 public final class StringResourceController {
     private StringResourceController(){}
     public static final String FALSE = "false";
     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.";
-    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++) {