From bc87301bac98e9b7c193337a0b6e6dce079a917b Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Sat, 22 Apr 2023 05:40:41 +0100 Subject: [PATCH] [TIDY] Automated code cleanup Thanks IntelliJ --- .../ac/soton/comp1206/component/GameBlockCoordinate.java | 3 +-- .../mgrove/ac/soton/comp1206/event/BlockClickedListener.java | 2 +- .../mgrove/ac/soton/comp1206/event/CommunicationsListener.java | 2 +- .../uk/mgrove/ac/soton/comp1206/event/GameLoopListener.java | 2 +- .../uk/mgrove/ac/soton/comp1206/event/LineClearedListener.java | 2 +- .../uk/mgrove/ac/soton/comp1206/event/MouseClickListener.java | 2 +- .../uk/mgrove/ac/soton/comp1206/event/NextPieceListener.java | 2 +- .../ac/soton/comp1206/event/ShowScoresSceneListener.java | 2 +- .../uk/mgrove/ac/soton/comp1206/scene/MultiplayerScene.java | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java index a47568a..8255977 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/component/GameBlockCoordinate.java @@ -99,8 +99,7 @@ public class GameBlockCoordinate { */ @Override public boolean equals(Object obj) { if (obj == this) return true; - if (obj instanceof GameBlockCoordinate) { - GameBlockCoordinate other = (GameBlockCoordinate) obj; + if (obj instanceof GameBlockCoordinate other) { return getX() == other.getX() && getY() == other.getY(); } else return false; } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java index dae48b7..4745bbb 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/BlockClickedListener.java @@ -12,5 +12,5 @@ public interface BlockClickedListener { * Handle a block clicked event * @param block the block that was clicked */ - public void blockClicked(GameBlock block); + void blockClicked(GameBlock block); } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java index 53abb8a..8390413 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/CommunicationsListener.java @@ -9,5 +9,5 @@ public interface CommunicationsListener { * Handle an incoming message received by the Communicator * @param communication the message that was received */ - public void receiveCommunication(String communication); + void receiveCommunication(String communication); } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/event/GameLoopListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/GameLoopListener.java index ab1e931..998038c 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/event/GameLoopListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/GameLoopListener.java @@ -9,6 +9,6 @@ public interface GameLoopListener { * Process the game loop being scheduled * @param timerDelay delay until game loop is executed */ - public void process(int timerDelay); + void process(int timerDelay); } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/event/LineClearedListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/LineClearedListener.java index aee632d..08014cc 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/event/LineClearedListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/LineClearedListener.java @@ -13,6 +13,6 @@ public interface LineClearedListener { * Process the line(s) being cleared * @param blockCoordinates coordinates of the blocks being cleared */ - public void clearLine(Set blockCoordinates); + void clearLine(Set blockCoordinates); } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/event/MouseClickListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/MouseClickListener.java index 0d7ae5e..415bfa9 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/event/MouseClickListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/MouseClickListener.java @@ -8,6 +8,6 @@ public interface MouseClickListener { /** * Handle node being right-clicked */ - public void action(); + void action(); } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/event/NextPieceListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/NextPieceListener.java index 93f5fc4..c357ada 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/event/NextPieceListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/NextPieceListener.java @@ -12,5 +12,5 @@ public interface NextPieceListener { * @param currentPiece the piece that was received * @param followingPiece the piece that was received for the next iteration */ - public void nextPiece(GamePiece currentPiece, GamePiece followingPiece); + void nextPiece(GamePiece currentPiece, GamePiece followingPiece); } \ No newline at end of file diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/event/ShowScoresSceneListener.java b/src/main/java/uk/mgrove/ac/soton/comp1206/event/ShowScoresSceneListener.java index d77c7a8..ceeb760 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/event/ShowScoresSceneListener.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/event/ShowScoresSceneListener.java @@ -10,6 +10,6 @@ public interface ShowScoresSceneListener { /** * Show the scene */ - public void show(Game game); + void show(Game game); } diff --git a/src/main/java/uk/mgrove/ac/soton/comp1206/scene/MultiplayerScene.java b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/MultiplayerScene.java index d13cdac..c28cf95 100644 --- a/src/main/java/uk/mgrove/ac/soton/comp1206/scene/MultiplayerScene.java +++ b/src/main/java/uk/mgrove/ac/soton/comp1206/scene/MultiplayerScene.java @@ -40,7 +40,7 @@ public class MultiplayerScene extends ChallengeScene { /** * Other players' live boards */ - private MapProperty playerBoards = new SimpleMapProperty<>(FXCollections.observableHashMap()); + private final MapProperty playerBoards = new SimpleMapProperty<>(FXCollections.observableHashMap()); /** * Grid of other players' live boards