Refactor according to package name rules

BME-MIT-IET · May 22, 2024 · 5824aa4 · 5824aa4
1 parent e83917f
commit 5824aa4
Show file tree

Hide file tree

Showing 32 changed files with 142 additions and 129 deletions.
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.*;

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.*;

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;

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;

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;
 

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;

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,9 +1,9 @@
-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";

diff --git a/src/main/java/Controll/Controller.java → src/main/java/control/Controller.java b/src/main/java/Controll/Controller.java → src/main/java/control/Controller.java
@@ -1,18 +1,18 @@
-package main.java.Controll;
-
-import main.java.Drawing.*;
-import main.java.Enums.Fluid;
-import main.java.Fields.ActiveFields.ActiveFields;
-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.Interfaces.Steppable;
-import main.java.Players.Mechanic;
-import main.java.Players.Player;
-import main.java.Players.Saboteur;
-import main.java.StringResource.StringResourceController;
+package main.java.control;
+
+import main.java.drawing.*;
+import main.java.enums.Fluid;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
+import main.java.fields.activefields.Spring;
+import main.java.interfaces.Steppable;
+import main.java.players.Mechanic;
+import main.java.players.Player;
+import main.java.players.Saboteur;
+import main.java.stringresource.StringResourceController;
 
 import java.io.*;
 import java.nio.file.Path;

diff --git a/src/main/java/Controll/Menu.java → src/main/java/control/Menu.java b/src/main/java/Controll/Menu.java → src/main/java/control/Menu.java
@@ -1,4 +1,4 @@
-package main.java.Controll;
+package main.java.control;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

diff --git a/src/main/java/Controll/ViewGame.java → src/main/java/control/ViewGame.java b/src/main/java/Controll/ViewGame.java → src/main/java/control/ViewGame.java
@@ -1,9 +1,9 @@
-package main.java.Controll;
+package main.java.control;
 
-import main.java.Drawing.Drawable;
-import main.java.Drawing.PipeDraw;
-import main.java.Enums.Fluid;
-import main.java.Fields.Pipe;
+import main.java.drawing.Drawable;
+import main.java.drawing.PipeDraw;
+import main.java.enums.Fluid;
+import main.java.fields.Pipe;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/src/main/java/Controll/WaterCounter.java → src/main/java/control/WaterCounter.java b/src/main/java/Controll/WaterCounter.java → src/main/java/control/WaterCounter.java
@@ -1,10 +1,10 @@
-package main.java.Controll;
-
-import main.java.Fields.ActiveFields.Cistern;
-import main.java.Fields.Pipe;
+package main.java.control;
 
 import java.util.ArrayList;
 
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+
 import static java.lang.Math.abs;
 
 /**

diff --git a/test/main/java/Controll/WaterCounterTest.java b/test/main/java/Controll/WaterCounterTest.java
@@ -5,8 +5,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
-import main.java.Fields.ActiveFields.Cistern;
+import main.java.control.WaterCounter;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
 
 class WaterCounterTest {
 	private WaterCounter waterCounter;

diff --git a/test/main/java/Fields/ActiveFields/CisternTest.java b/test/main/java/Fields/ActiveFields/CisternTest.java
@@ -5,7 +5,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Cistern;
+import main.java.fields.activefields.Pump;
 
 class CisternTest {
 	private Cistern cistern;

diff --git a/test/main/java/Fields/ActiveFields/PumpTest.java b/test/main/java/Fields/ActiveFields/PumpTest.java
@@ -7,7 +7,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Pump;
 
 class PumpTest {
 	private Pump pump;

diff --git a/test/main/java/Fields/ActiveFields/SpringTest.java b/test/main/java/Fields/ActiveFields/SpringTest.java
@@ -7,8 +7,9 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import main.java.Fields.Pipe;
-import main.java.Players.Mechanic;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.Spring;
+import main.java.players.Mechanic;
 
 class SpringTest {
 	private Spring spring;

diff --git a/test/main/java/Fields/PipeTest.java b/test/main/java/Fields/PipeTest.java
@@ -7,12 +7,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-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.Mechanic;
-import main.java.Players.Player;
+import main.java.control.Controller;
+import main.java.enums.Fluid;
+import main.java.fields.Field;
+import main.java.fields.Pipe;
+import main.java.fields.activefields.ActiveFields;
+import main.java.fields.activefields.Pump;
+import main.java.players.Mechanic;
+import main.java.players.Player;
 
 class PipeTest {
 	private Pipe pipe;