From b87bd5183ee2dc2a9ecaa5d6c62489215e853f49 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Sat, 1 Feb 2025 14:47:46 +0100 Subject: [PATCH] create package org.polytech.ryuk --- app/build.gradle | 2 +- .../java/network/protocol/PacketVisitor.java | 31 ---------------- .../polytech/ryuk}/common/ConsumerSignal.java | 2 +- .../polytech/ryuk}/common/Signal.java | 2 +- .../{ => org/polytech/ryuk}/game/Game.java | 4 +-- .../{ => org/polytech/ryuk}/game/Player.java | 2 +- .../ryuk}/gui/AnimatedBackground.java | 2 +- .../polytech/ryuk}/gui/ColorGenerator.java | 2 +- .../{ => org/polytech/ryuk}/gui/Fonts.java | 2 +- .../{ => org/polytech/ryuk}/gui/Images.java | 2 +- .../{ => org/polytech/ryuk}/gui/Main.java | 8 ++--- .../{ => org/polytech/ryuk}/gui/Options.java | 2 +- .../ryuk}/gui/RenderableMultidoku.java | 12 +++---- .../polytech/ryuk}/gui/SudokuType.java | 8 ++--- .../{ => org/polytech/ryuk}/gui/Symbols.java | 2 +- .../polytech/ryuk}/gui/menu/BaseView.java | 2 +- .../ryuk}/gui/menu/ConnexionStatusView.java | 7 ++-- .../polytech/ryuk}/gui/menu/EndGameView.java | 11 +++--- .../polytech/ryuk}/gui/menu/MainMenu.java | 2 +- .../polytech/ryuk}/gui/menu/MultiMenu.java | 2 +- .../ryuk}/gui/menu/MultiPlayerDokuView.java | 25 ++++++------- .../ryuk}/gui/menu/MultiPlayerView.java | 13 +++---- .../polytech/ryuk}/gui/menu/OptionsMenu.java | 7 ++-- .../polytech/ryuk}/gui/menu/SoloMenu.java | 7 ++-- .../polytech/ryuk}/gui/menu/StateMachine.java | 5 +-- .../polytech/ryuk}/gui/menu/SudokuView.java | 17 ++++----- .../ryuk}/gui/widget/LeaderboardRenderer.java | 7 ++-- .../widget/MultiPlayerCompleteProgress.java | 7 ++-- .../ryuk}/gui/widget/SmoothProgressBar.java | 2 +- .../ryuk}/gui/widget/SudokuRenderer.java | 29 +++++++-------- .../ryuk}/gui/widget/SudokuSelector.java | 15 ++++---- .../ryuk}/gui/widget/TimerRenderer.java | 2 +- .../polytech/ryuk}/network/Connexion.java | 6 ++-- .../ryuk}/network/ConnexionThread.java | 4 +-- .../polytech/ryuk}/network/client/Client.java | 20 +++++------ .../ryuk}/network/client/ClientConnexion.java | 28 +++++++-------- .../ryuk}/network/protocol/Packet.java | 2 +- .../ryuk/network/protocol/PacketVisitor.java | 31 ++++++++++++++++ .../ryuk}/network/protocol/Packets.java | 2 +- .../protocol/packets/ChangeCellPacket.java | 8 ++--- .../protocol/packets/ConnexionInfoPacket.java | 8 ++--- .../protocol/packets/DisconnectPacket.java | 8 ++--- .../protocol/packets/EndGamePacket.java | 8 ++--- .../protocol/packets/KeepAlivePacket.java | 8 ++--- .../network/protocol/packets/LoginPacket.java | 8 ++--- .../protocol/packets/PlayerJoinPacket.java | 10 +++--- .../protocol/packets/PlayerLeavePacket.java | 8 ++--- .../protocol/packets/StartGamePacket.java | 8 ++--- .../packets/UpdatePlayerScorePacket.java | 8 ++--- .../network/server/KeepAliveHandler.java | 4 +-- .../polytech/ryuk}/network/server/Server.java | 18 +++++----- .../network/server/ServerAcceptThread.java | 2 +- .../ryuk}/network/server/ServerConnexion.java | 36 +++++++++---------- .../network/server/ServerLogicThread.java | 2 +- .../{ => org/polytech/ryuk}/sudoku/Main.java | 4 +-- .../sudoku/constraint/BlockConstraint.java | 6 ++-- .../sudoku/constraint/ColumnConstraint.java | 6 ++-- .../ryuk}/sudoku/constraint/Constraint.java | 4 +-- .../sudoku/constraint/DiagonalConstraint.java | 4 +-- .../ryuk}/sudoku/constraint/IConstraint.java | 4 +-- .../sudoku/constraint/LineConstraint.java | 4 +-- .../ryuk}/sudoku/io/ConsoleInterface.java | 14 ++++---- .../polytech/ryuk/sudoku/io/SudokuFile.java | 7 ++++ .../ryuk}/sudoku/io/SudokuPrinter.java | 6 ++-- .../polytech/ryuk}/sudoku/io/SudokuSave.java | 2 +- .../ryuk}/sudoku/io/SudokuSerializer.java | 13 ++++--- .../sudoku/solver/BacktrackingSolver.java | 6 ++-- .../ryuk}/sudoku/solver/HumanSolver.java | 10 +++--- .../ryuk}/sudoku/solver/MixedSolver.java | 10 +++--- .../ryuk}/sudoku/solver/RandomSolver.java | 10 +++--- .../polytech/ryuk}/sudoku/solver/Solver.java | 6 ++-- .../ryuk}/sudoku/solver/StupidSolver.java | 6 ++-- .../ryuk}/sudoku/structure/Block.java | 2 +- .../polytech/ryuk}/sudoku/structure/Cell.java | 2 +- .../ryuk}/sudoku/structure/Coordinate.java | 2 +- .../ryuk}/sudoku/structure/Difficulty.java | 2 +- .../ryuk}/sudoku/structure/MultiDoku.java | 4 +-- .../ryuk}/sudoku/structure/StateManager.java | 2 +- .../ryuk}/sudoku/structure/Sudoku.java | 9 ++--- .../ryuk}/sudoku/structure/SudokuFactory.java | 10 +++--- app/src/main/java/sudoku/io/SudokuFile.java | 7 ---- app/src/test/java/sudoku/AppTest.java | 14 -------- .../java/sudoku/SudokuSerializerTest.java | 9 +++-- .../test/java/sudoku/solver/SolverTest.java | 17 ++++----- 84 files changed, 338 insertions(+), 344 deletions(-) delete mode 100644 app/src/main/java/network/protocol/PacketVisitor.java rename app/src/main/java/{ => org/polytech/ryuk}/common/ConsumerSignal.java (93%) rename app/src/main/java/{ => org/polytech/ryuk}/common/Signal.java (93%) rename app/src/main/java/{ => org/polytech/ryuk}/game/Game.java (95%) rename app/src/main/java/{ => org/polytech/ryuk}/game/Player.java (94%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/AnimatedBackground.java (96%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/ColorGenerator.java (98%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/Fonts.java (97%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/Images.java (97%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/Main.java (87%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/Options.java (80%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/RenderableMultidoku.java (95%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/SudokuType.java (89%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/Symbols.java (98%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/BaseView.java (93%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/ConnexionStatusView.java (94%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/EndGameView.java (83%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/MainMenu.java (96%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/MultiMenu.java (97%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/MultiPlayerDokuView.java (74%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/MultiPlayerView.java (86%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/OptionsMenu.java (85%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/SoloMenu.java (79%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/StateMachine.java (93%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/menu/SudokuView.java (88%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/widget/LeaderboardRenderer.java (95%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/widget/MultiPlayerCompleteProgress.java (88%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/widget/SmoothProgressBar.java (92%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/widget/SudokuRenderer.java (87%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/widget/SudokuSelector.java (91%) rename app/src/main/java/{ => org/polytech/ryuk}/gui/widget/TimerRenderer.java (94%) rename app/src/main/java/{ => org/polytech/ryuk}/network/Connexion.java (86%) rename app/src/main/java/{ => org/polytech/ryuk}/network/ConnexionThread.java (91%) rename app/src/main/java/{ => org/polytech/ryuk}/network/client/Client.java (78%) rename app/src/main/java/{ => org/polytech/ryuk}/network/client/ClientConnexion.java (72%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/Packet.java (80%) create mode 100644 app/src/main/java/org/polytech/ryuk/network/protocol/PacketVisitor.java rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/Packets.java (77%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/ChangeCellPacket.java (75%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/ConnexionInfoPacket.java (66%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/DisconnectPacket.java (64%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/EndGamePacket.java (54%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/KeepAlivePacket.java (65%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/LoginPacket.java (63%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/PlayerJoinPacket.java (60%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/PlayerLeavePacket.java (64%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/StartGamePacket.java (78%) rename app/src/main/java/{ => org/polytech/ryuk}/network/protocol/packets/UpdatePlayerScorePacket.java (71%) rename app/src/main/java/{ => org/polytech/ryuk}/network/server/KeepAliveHandler.java (90%) rename app/src/main/java/{ => org/polytech/ryuk}/network/server/Server.java (83%) rename app/src/main/java/{ => org/polytech/ryuk}/network/server/ServerAcceptThread.java (94%) rename app/src/main/java/{ => org/polytech/ryuk}/network/server/ServerConnexion.java (81%) rename app/src/main/java/{ => org/polytech/ryuk}/network/server/ServerLogicThread.java (90%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/Main.java (77%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/constraint/BlockConstraint.java (62%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/constraint/ColumnConstraint.java (70%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/constraint/Constraint.java (92%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/constraint/DiagonalConstraint.java (84%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/constraint/IConstraint.java (81%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/constraint/LineConstraint.java (75%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/io/ConsoleInterface.java (93%) create mode 100644 app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuFile.java rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/io/SudokuPrinter.java (91%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/io/SudokuSave.java (83%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/io/SudokuSerializer.java (95%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/solver/BacktrackingSolver.java (87%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/solver/HumanSolver.java (83%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/solver/MixedSolver.java (89%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/solver/RandomSolver.java (88%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/solver/Solver.java (88%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/solver/StupidSolver.java (88%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/Block.java (96%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/Cell.java (98%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/Coordinate.java (95%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/Difficulty.java (94%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/MultiDoku.java (97%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/StateManager.java (94%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/Sudoku.java (97%) rename app/src/main/java/{ => org/polytech/ryuk}/sudoku/structure/SudokuFactory.java (97%) delete mode 100644 app/src/main/java/sudoku/io/SudokuFile.java delete mode 100644 app/src/test/java/sudoku/AppTest.java diff --git a/app/build.gradle b/app/build.gradle index 0067423..3c478ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,7 +33,7 @@ dependencies { application { // Define the main class for the application. - mainClass = 'gui.Main' + mainClass = 'org.polytech.ryuk.gui.Main' } // Add libraries into the final jar diff --git a/app/src/main/java/network/protocol/PacketVisitor.java b/app/src/main/java/network/protocol/PacketVisitor.java deleted file mode 100644 index 9639fd5..0000000 --- a/app/src/main/java/network/protocol/PacketVisitor.java +++ /dev/null @@ -1,31 +0,0 @@ -package network.protocol; - -import network.protocol.packets.ChangeCellPacket; -import network.protocol.packets.ConnexionInfoPacket; -import network.protocol.packets.DisconnectPacket; -import network.protocol.packets.EndGamePacket; -import network.protocol.packets.KeepAlivePacket; -import network.protocol.packets.LoginPacket; -import network.protocol.packets.PlayerJoinPacket; -import network.protocol.packets.PlayerLeavePacket; -import network.protocol.packets.StartGamePacket; -import network.protocol.packets.UpdatePlayerScorePacket; - -public interface PacketVisitor { - - default void visit(Packet packet) { - packet.accept(this); - } - - void visitPacket(ConnexionInfoPacket packet); - void visitPacket(DisconnectPacket packet); - void visitPacket(KeepAlivePacket packet); - void visitPacket(LoginPacket packet); - void visitPacket(PlayerJoinPacket packet); - void visitPacket(PlayerLeavePacket packet); - void visitPacket(StartGamePacket packet); - void visitPacket(EndGamePacket packet); - void visitPacket(UpdatePlayerScorePacket packet); - void visitPacket(ChangeCellPacket packet); - -} diff --git a/app/src/main/java/common/ConsumerSignal.java b/app/src/main/java/org/polytech/ryuk/common/ConsumerSignal.java similarity index 93% rename from app/src/main/java/common/ConsumerSignal.java rename to app/src/main/java/org/polytech/ryuk/common/ConsumerSignal.java index ba4b046..6650aa3 100644 --- a/app/src/main/java/common/ConsumerSignal.java +++ b/app/src/main/java/org/polytech/ryuk/common/ConsumerSignal.java @@ -1,4 +1,4 @@ -package common; +package org.polytech.ryuk.common; import java.util.HashSet; import java.util.Set; diff --git a/app/src/main/java/common/Signal.java b/app/src/main/java/org/polytech/ryuk/common/Signal.java similarity index 93% rename from app/src/main/java/common/Signal.java rename to app/src/main/java/org/polytech/ryuk/common/Signal.java index 6e4154d..566b939 100644 --- a/app/src/main/java/common/Signal.java +++ b/app/src/main/java/org/polytech/ryuk/common/Signal.java @@ -1,4 +1,4 @@ -package common; +package org.polytech.ryuk.common; import java.util.HashSet; import java.util.Set; diff --git a/app/src/main/java/game/Game.java b/app/src/main/java/org/polytech/ryuk/game/Game.java similarity index 95% rename from app/src/main/java/game/Game.java rename to app/src/main/java/org/polytech/ryuk/game/Game.java index 6e5d502..aa68e53 100644 --- a/app/src/main/java/game/Game.java +++ b/app/src/main/java/org/polytech/ryuk/game/Game.java @@ -1,4 +1,4 @@ -package game; +package org.polytech.ryuk.game; import java.time.Instant; import java.util.ArrayList; @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.MultiDoku; public class Game { diff --git a/app/src/main/java/game/Player.java b/app/src/main/java/org/polytech/ryuk/game/Player.java similarity index 94% rename from app/src/main/java/game/Player.java rename to app/src/main/java/org/polytech/ryuk/game/Player.java index 0b40f34..162dda8 100644 --- a/app/src/main/java/game/Player.java +++ b/app/src/main/java/org/polytech/ryuk/game/Player.java @@ -1,4 +1,4 @@ -package game; +package org.polytech.ryuk.game; import java.io.Serializable; diff --git a/app/src/main/java/gui/AnimatedBackground.java b/app/src/main/java/org/polytech/ryuk/gui/AnimatedBackground.java similarity index 96% rename from app/src/main/java/gui/AnimatedBackground.java rename to app/src/main/java/org/polytech/ryuk/gui/AnimatedBackground.java index ebc6f52..8dec3c7 100644 --- a/app/src/main/java/gui/AnimatedBackground.java +++ b/app/src/main/java/org/polytech/ryuk/gui/AnimatedBackground.java @@ -1,4 +1,4 @@ -package gui; +package org.polytech.ryuk.gui; import imgui.ImGui; import imgui.ImVec2; diff --git a/app/src/main/java/gui/ColorGenerator.java b/app/src/main/java/org/polytech/ryuk/gui/ColorGenerator.java similarity index 98% rename from app/src/main/java/gui/ColorGenerator.java rename to app/src/main/java/org/polytech/ryuk/gui/ColorGenerator.java index 80f767e..4ed0962 100644 --- a/app/src/main/java/gui/ColorGenerator.java +++ b/app/src/main/java/org/polytech/ryuk/gui/ColorGenerator.java @@ -1,4 +1,4 @@ -package gui; +package org.polytech.ryuk.gui; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/gui/Fonts.java b/app/src/main/java/org/polytech/ryuk/gui/Fonts.java similarity index 97% rename from app/src/main/java/gui/Fonts.java rename to app/src/main/java/org/polytech/ryuk/gui/Fonts.java index 46d4907..7830dcb 100644 --- a/app/src/main/java/gui/Fonts.java +++ b/app/src/main/java/org/polytech/ryuk/gui/Fonts.java @@ -1,4 +1,4 @@ -package gui; +package org.polytech.ryuk.gui; import imgui.ImFont; import imgui.ImFontConfig; diff --git a/app/src/main/java/gui/Images.java b/app/src/main/java/org/polytech/ryuk/gui/Images.java similarity index 97% rename from app/src/main/java/gui/Images.java rename to app/src/main/java/org/polytech/ryuk/gui/Images.java index 3dcafe3..8c1d6ce 100644 --- a/app/src/main/java/gui/Images.java +++ b/app/src/main/java/org/polytech/ryuk/gui/Images.java @@ -1,4 +1,4 @@ -package gui; +package org.polytech.ryuk.gui; import java.nio.ByteBuffer; diff --git a/app/src/main/java/gui/Main.java b/app/src/main/java/org/polytech/ryuk/gui/Main.java similarity index 87% rename from app/src/main/java/gui/Main.java rename to app/src/main/java/org/polytech/ryuk/gui/Main.java index 44a3e5a..01964af 100644 --- a/app/src/main/java/gui/Main.java +++ b/app/src/main/java/org/polytech/ryuk/gui/Main.java @@ -1,8 +1,8 @@ -package gui; +package org.polytech.ryuk.gui; + +import org.polytech.ryuk.gui.menu.MainMenu; +import org.polytech.ryuk.gui.menu.StateMachine; -import gui.menu.MainMenu; -import gui.menu.StateMachine; -import imgui.ImGui; import imgui.app.Application; import imgui.app.Configuration; diff --git a/app/src/main/java/gui/Options.java b/app/src/main/java/org/polytech/ryuk/gui/Options.java similarity index 80% rename from app/src/main/java/gui/Options.java rename to app/src/main/java/org/polytech/ryuk/gui/Options.java index 238f60f..18581fa 100644 --- a/app/src/main/java/gui/Options.java +++ b/app/src/main/java/org/polytech/ryuk/gui/Options.java @@ -1,4 +1,4 @@ -package gui; +package org.polytech.ryuk.gui; public class Options { diff --git a/app/src/main/java/gui/RenderableMultidoku.java b/app/src/main/java/org/polytech/ryuk/gui/RenderableMultidoku.java similarity index 95% rename from app/src/main/java/gui/RenderableMultidoku.java rename to app/src/main/java/org/polytech/ryuk/gui/RenderableMultidoku.java index 6e14235..2d0ce0a 100644 --- a/app/src/main/java/gui/RenderableMultidoku.java +++ b/app/src/main/java/org/polytech/ryuk/gui/RenderableMultidoku.java @@ -1,15 +1,15 @@ -package gui; +package org.polytech.ryuk.gui; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import sudoku.structure.Block; -import sudoku.structure.Cell; -import sudoku.structure.Coordinate; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.Block; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.Coordinate; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class RenderableMultidoku { diff --git a/app/src/main/java/gui/SudokuType.java b/app/src/main/java/org/polytech/ryuk/gui/SudokuType.java similarity index 89% rename from app/src/main/java/gui/SudokuType.java rename to app/src/main/java/org/polytech/ryuk/gui/SudokuType.java index c7646a7..44e1cc1 100644 --- a/app/src/main/java/gui/SudokuType.java +++ b/app/src/main/java/org/polytech/ryuk/gui/SudokuType.java @@ -1,10 +1,10 @@ -package gui; +package org.polytech.ryuk.gui; import java.util.List; -import sudoku.constraint.Constraint; -import sudoku.structure.MultiDoku; -import sudoku.structure.SudokuFactory;; +import org.polytech.ryuk.sudoku.constraint.Constraint; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.SudokuFactory;; public enum SudokuType { diff --git a/app/src/main/java/gui/Symbols.java b/app/src/main/java/org/polytech/ryuk/gui/Symbols.java similarity index 98% rename from app/src/main/java/gui/Symbols.java rename to app/src/main/java/org/polytech/ryuk/gui/Symbols.java index 082db8b..ec3aba2 100644 --- a/app/src/main/java/gui/Symbols.java +++ b/app/src/main/java/org/polytech/ryuk/gui/Symbols.java @@ -1,4 +1,4 @@ -package gui; +package org.polytech.ryuk.gui; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/gui/menu/BaseView.java b/app/src/main/java/org/polytech/ryuk/gui/menu/BaseView.java similarity index 93% rename from app/src/main/java/gui/menu/BaseView.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/BaseView.java index 7da67ce..a34f895 100644 --- a/app/src/main/java/gui/menu/BaseView.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/BaseView.java @@ -1,4 +1,4 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; import imgui.ImGui; diff --git a/app/src/main/java/gui/menu/ConnexionStatusView.java b/app/src/main/java/org/polytech/ryuk/gui/menu/ConnexionStatusView.java similarity index 94% rename from app/src/main/java/gui/menu/ConnexionStatusView.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/ConnexionStatusView.java index 13f527f..4152c47 100644 --- a/app/src/main/java/gui/menu/ConnexionStatusView.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/ConnexionStatusView.java @@ -1,11 +1,12 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; import java.io.IOException; import java.net.UnknownHostException; +import org.polytech.ryuk.network.client.Client; +import org.polytech.ryuk.network.server.Server; + import imgui.ImGui; -import network.client.Client; -import network.server.Server; public class ConnexionStatusView extends BaseView { diff --git a/app/src/main/java/gui/menu/EndGameView.java b/app/src/main/java/org/polytech/ryuk/gui/menu/EndGameView.java similarity index 83% rename from app/src/main/java/gui/menu/EndGameView.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/EndGameView.java index 409c3f1..29dc039 100644 --- a/app/src/main/java/gui/menu/EndGameView.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/EndGameView.java @@ -1,11 +1,12 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; + +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.gui.ColorGenerator; +import org.polytech.ryuk.gui.widget.SudokuRenderer; +import org.polytech.ryuk.sudoku.structure.MultiDoku; -import game.Player; -import gui.ColorGenerator; -import gui.widget.SudokuRenderer; import imgui.ImGui; import imgui.ImVec4; -import sudoku.structure.MultiDoku; public class EndGameView extends BaseView { diff --git a/app/src/main/java/gui/menu/MainMenu.java b/app/src/main/java/org/polytech/ryuk/gui/menu/MainMenu.java similarity index 96% rename from app/src/main/java/gui/menu/MainMenu.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/MainMenu.java index 1e09b95..f327af5 100644 --- a/app/src/main/java/gui/menu/MainMenu.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/MainMenu.java @@ -1,4 +1,4 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; import imgui.ImGui; import imgui.ImVec2; diff --git a/app/src/main/java/gui/menu/MultiMenu.java b/app/src/main/java/org/polytech/ryuk/gui/menu/MultiMenu.java similarity index 97% rename from app/src/main/java/gui/menu/MultiMenu.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/MultiMenu.java index 7b5dc86..f3f5b55 100644 --- a/app/src/main/java/gui/menu/MultiMenu.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/MultiMenu.java @@ -1,4 +1,4 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; import java.io.IOException; diff --git a/app/src/main/java/gui/menu/MultiPlayerDokuView.java b/app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerDokuView.java similarity index 74% rename from app/src/main/java/gui/menu/MultiPlayerDokuView.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerDokuView.java index f9ad32a..ff98b5d 100644 --- a/app/src/main/java/gui/menu/MultiPlayerDokuView.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerDokuView.java @@ -1,17 +1,18 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; + +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.gui.widget.LeaderboardRenderer; +import org.polytech.ryuk.gui.widget.MultiPlayerCompleteProgress; +import org.polytech.ryuk.gui.widget.SudokuRenderer; +import org.polytech.ryuk.gui.widget.TimerRenderer; +import org.polytech.ryuk.network.client.Client; +import org.polytech.ryuk.network.server.Server; +import org.polytech.ryuk.sudoku.solver.BacktrackingSolver; +import org.polytech.ryuk.sudoku.solver.Solver; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; -import game.Player; -import gui.widget.LeaderboardRenderer; -import gui.widget.MultiPlayerCompleteProgress; -import gui.widget.SudokuRenderer; -import gui.widget.TimerRenderer; import imgui.ImGui; -import network.client.Client; -import network.server.Server; -import sudoku.solver.BacktrackingSolver; -import sudoku.solver.Solver; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; public class MultiPlayerDokuView extends BaseView { diff --git a/app/src/main/java/gui/menu/MultiPlayerView.java b/app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerView.java similarity index 86% rename from app/src/main/java/gui/menu/MultiPlayerView.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerView.java index c5668ad..bdaeeca 100644 --- a/app/src/main/java/gui/menu/MultiPlayerView.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/MultiPlayerView.java @@ -1,12 +1,13 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; + +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.gui.widget.SudokuSelector; +import org.polytech.ryuk.network.client.Client; +import org.polytech.ryuk.network.server.Server; +import org.polytech.ryuk.sudoku.structure.MultiDoku; -import game.Player; -import gui.widget.SudokuSelector; import imgui.ImGui; import imgui.type.ImInt; -import network.client.Client; -import network.server.Server; -import sudoku.structure.MultiDoku; public class MultiPlayerView extends BaseView { diff --git a/app/src/main/java/gui/menu/OptionsMenu.java b/app/src/main/java/org/polytech/ryuk/gui/menu/OptionsMenu.java similarity index 85% rename from app/src/main/java/gui/menu/OptionsMenu.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/OptionsMenu.java index 382ee54..5095727 100644 --- a/app/src/main/java/gui/menu/OptionsMenu.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/OptionsMenu.java @@ -1,7 +1,8 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; + +import org.polytech.ryuk.gui.Options; +import org.polytech.ryuk.gui.Symbols; -import gui.Options; -import gui.Symbols; import imgui.ImGui; import imgui.type.ImInt; diff --git a/app/src/main/java/gui/menu/SoloMenu.java b/app/src/main/java/org/polytech/ryuk/gui/menu/SoloMenu.java similarity index 79% rename from app/src/main/java/gui/menu/SoloMenu.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/SoloMenu.java index d823671..6685774 100644 --- a/app/src/main/java/gui/menu/SoloMenu.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/SoloMenu.java @@ -1,8 +1,9 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; + +import org.polytech.ryuk.gui.widget.SudokuSelector; +import org.polytech.ryuk.sudoku.structure.MultiDoku; -import gui.widget.SudokuSelector; import imgui.ImGui; -import sudoku.structure.MultiDoku; public class SoloMenu extends BaseView { diff --git a/app/src/main/java/gui/menu/StateMachine.java b/app/src/main/java/org/polytech/ryuk/gui/menu/StateMachine.java similarity index 93% rename from app/src/main/java/gui/menu/StateMachine.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/StateMachine.java index fdf5920..4ed0766 100644 --- a/app/src/main/java/gui/menu/StateMachine.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/StateMachine.java @@ -1,8 +1,9 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; import java.util.Stack; -import gui.AnimatedBackground; +import org.polytech.ryuk.gui.AnimatedBackground; + import imgui.ImGui; import imgui.ImVec2; import imgui.flag.ImGuiKey; diff --git a/app/src/main/java/gui/menu/SudokuView.java b/app/src/main/java/org/polytech/ryuk/gui/menu/SudokuView.java similarity index 88% rename from app/src/main/java/gui/menu/SudokuView.java rename to app/src/main/java/org/polytech/ryuk/gui/menu/SudokuView.java index 39d01ef..e6507ca 100644 --- a/app/src/main/java/gui/menu/SudokuView.java +++ b/app/src/main/java/org/polytech/ryuk/gui/menu/SudokuView.java @@ -1,16 +1,17 @@ -package gui.menu; +package org.polytech.ryuk.gui.menu; import java.util.concurrent.CancellationException; -import gui.widget.SudokuRenderer; +import org.polytech.ryuk.gui.widget.SudokuRenderer; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; +import org.polytech.ryuk.sudoku.solver.BacktrackingSolver; +import org.polytech.ryuk.sudoku.solver.HumanSolver; +import org.polytech.ryuk.sudoku.solver.MixedSolver; +import org.polytech.ryuk.sudoku.solver.Solver; +import org.polytech.ryuk.sudoku.structure.MultiDoku; + import imgui.ImGui; import imgui.ImGuiStyle; -import sudoku.io.SudokuSerializer; -import sudoku.solver.BacktrackingSolver; -import sudoku.solver.HumanSolver; -import sudoku.solver.MixedSolver; -import sudoku.solver.Solver; -import sudoku.structure.MultiDoku; public class SudokuView extends BaseView { diff --git a/app/src/main/java/gui/widget/LeaderboardRenderer.java b/app/src/main/java/org/polytech/ryuk/gui/widget/LeaderboardRenderer.java similarity index 95% rename from app/src/main/java/gui/widget/LeaderboardRenderer.java rename to app/src/main/java/org/polytech/ryuk/gui/widget/LeaderboardRenderer.java index 20b4c0d..66023c4 100644 --- a/app/src/main/java/gui/widget/LeaderboardRenderer.java +++ b/app/src/main/java/org/polytech/ryuk/gui/widget/LeaderboardRenderer.java @@ -1,7 +1,8 @@ -package gui.widget; +package org.polytech.ryuk.gui.widget; + +import org.polytech.ryuk.game.Game; +import org.polytech.ryuk.game.Player; -import game.Game; -import game.Player; import imgui.ImGui; import imgui.ImVec2; import imgui.ImVec4; diff --git a/app/src/main/java/gui/widget/MultiPlayerCompleteProgress.java b/app/src/main/java/org/polytech/ryuk/gui/widget/MultiPlayerCompleteProgress.java similarity index 88% rename from app/src/main/java/gui/widget/MultiPlayerCompleteProgress.java rename to app/src/main/java/org/polytech/ryuk/gui/widget/MultiPlayerCompleteProgress.java index d5bebee..96222eb 100644 --- a/app/src/main/java/gui/widget/MultiPlayerCompleteProgress.java +++ b/app/src/main/java/org/polytech/ryuk/gui/widget/MultiPlayerCompleteProgress.java @@ -1,7 +1,8 @@ -package gui.widget; +package org.polytech.ryuk.gui.widget; + +import org.polytech.ryuk.game.Game; +import org.polytech.ryuk.game.Player; -import game.Game; -import game.Player; import imgui.ImGui; import imgui.ImVec2; diff --git a/app/src/main/java/gui/widget/SmoothProgressBar.java b/app/src/main/java/org/polytech/ryuk/gui/widget/SmoothProgressBar.java similarity index 92% rename from app/src/main/java/gui/widget/SmoothProgressBar.java rename to app/src/main/java/org/polytech/ryuk/gui/widget/SmoothProgressBar.java index 9db2971..c9aba14 100644 --- a/app/src/main/java/gui/widget/SmoothProgressBar.java +++ b/app/src/main/java/org/polytech/ryuk/gui/widget/SmoothProgressBar.java @@ -1,4 +1,4 @@ -package gui.widget; +package org.polytech.ryuk.gui.widget; import imgui.ImGui; import imgui.ImVec2; diff --git a/app/src/main/java/gui/widget/SudokuRenderer.java b/app/src/main/java/org/polytech/ryuk/gui/widget/SudokuRenderer.java similarity index 87% rename from app/src/main/java/gui/widget/SudokuRenderer.java rename to app/src/main/java/org/polytech/ryuk/gui/widget/SudokuRenderer.java index 4b38cf1..6b35d21 100644 --- a/app/src/main/java/gui/widget/SudokuRenderer.java +++ b/app/src/main/java/org/polytech/ryuk/gui/widget/SudokuRenderer.java @@ -1,4 +1,4 @@ -package gui.widget; +package org.polytech.ryuk.gui.widget; import java.util.HashMap; import java.util.HashSet; @@ -6,24 +6,25 @@ import java.util.List; import java.util.Map; import java.util.Set; -import common.ConsumerSignal; -import common.Signal; -import gui.ColorGenerator; -import gui.Fonts; -import gui.Options; -import gui.RenderableMultidoku; -import gui.Symbols; -import gui.ColorGenerator.Color; +import org.polytech.ryuk.common.ConsumerSignal; +import org.polytech.ryuk.common.Signal; +import org.polytech.ryuk.gui.ColorGenerator; +import org.polytech.ryuk.gui.ColorGenerator.Color; +import org.polytech.ryuk.gui.Fonts; +import org.polytech.ryuk.gui.Options; +import org.polytech.ryuk.gui.RenderableMultidoku; +import org.polytech.ryuk.gui.Symbols; +import org.polytech.ryuk.sudoku.constraint.Constraint; +import org.polytech.ryuk.sudoku.structure.Block; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; + import imgui.ImGui; import imgui.ImVec2; import imgui.ImVec4; import imgui.flag.ImGuiCol; import imgui.flag.ImGuiStyleVar; -import sudoku.constraint.Constraint; -import sudoku.structure.Block; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; public class SudokuRenderer { diff --git a/app/src/main/java/gui/widget/SudokuSelector.java b/app/src/main/java/org/polytech/ryuk/gui/widget/SudokuSelector.java similarity index 91% rename from app/src/main/java/gui/widget/SudokuSelector.java rename to app/src/main/java/org/polytech/ryuk/gui/widget/SudokuSelector.java index db1b69e..cc78c72 100644 --- a/app/src/main/java/gui/widget/SudokuSelector.java +++ b/app/src/main/java/org/polytech/ryuk/gui/widget/SudokuSelector.java @@ -1,19 +1,20 @@ -package gui.widget; +package org.polytech.ryuk.gui.widget; import java.util.ArrayList; import java.util.List; -import common.ConsumerSignal; -import gui.SudokuType; +import org.polytech.ryuk.common.ConsumerSignal; +import org.polytech.ryuk.gui.SudokuType; +import org.polytech.ryuk.sudoku.constraint.Constraint; +import org.polytech.ryuk.sudoku.structure.Difficulty; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.SudokuFactory; + import imgui.ImGui; import imgui.extension.imguifiledialog.ImGuiFileDialog; import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags; import imgui.type.ImBoolean; import imgui.type.ImInt; -import sudoku.constraint.Constraint; -import sudoku.structure.Difficulty; -import sudoku.structure.MultiDoku; -import sudoku.structure.SudokuFactory; public class SudokuSelector { diff --git a/app/src/main/java/gui/widget/TimerRenderer.java b/app/src/main/java/org/polytech/ryuk/gui/widget/TimerRenderer.java similarity index 94% rename from app/src/main/java/gui/widget/TimerRenderer.java rename to app/src/main/java/org/polytech/ryuk/gui/widget/TimerRenderer.java index 10548b7..8f3c1ab 100644 --- a/app/src/main/java/gui/widget/TimerRenderer.java +++ b/app/src/main/java/org/polytech/ryuk/gui/widget/TimerRenderer.java @@ -1,4 +1,4 @@ -package gui.widget; +package org.polytech.ryuk.gui.widget; import java.time.Instant; diff --git a/app/src/main/java/network/Connexion.java b/app/src/main/java/org/polytech/ryuk/network/Connexion.java similarity index 86% rename from app/src/main/java/network/Connexion.java rename to app/src/main/java/org/polytech/ryuk/network/Connexion.java index 1b1e285..86b977e 100644 --- a/app/src/main/java/network/Connexion.java +++ b/app/src/main/java/org/polytech/ryuk/network/Connexion.java @@ -1,11 +1,11 @@ -package network; +package org.polytech.ryuk.network; import java.io.IOException; import java.io.ObjectOutputStream; import java.net.Socket; -import network.protocol.Packet; -import network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; public abstract class Connexion implements PacketVisitor { diff --git a/app/src/main/java/network/ConnexionThread.java b/app/src/main/java/org/polytech/ryuk/network/ConnexionThread.java similarity index 91% rename from app/src/main/java/network/ConnexionThread.java rename to app/src/main/java/org/polytech/ryuk/network/ConnexionThread.java index 17b0584..b5efb8d 100644 --- a/app/src/main/java/network/ConnexionThread.java +++ b/app/src/main/java/org/polytech/ryuk/network/ConnexionThread.java @@ -1,9 +1,9 @@ -package network; +package org.polytech.ryuk.network; import java.io.IOException; import java.io.ObjectInputStream; -import network.protocol.Packet; +import org.polytech.ryuk.network.protocol.Packet; public class ConnexionThread extends Thread { diff --git a/app/src/main/java/network/client/Client.java b/app/src/main/java/org/polytech/ryuk/network/client/Client.java similarity index 78% rename from app/src/main/java/network/client/Client.java rename to app/src/main/java/org/polytech/ryuk/network/client/Client.java index de7865c..1a9963b 100644 --- a/app/src/main/java/network/client/Client.java +++ b/app/src/main/java/org/polytech/ryuk/network/client/Client.java @@ -1,18 +1,18 @@ -package network.client; +package org.polytech.ryuk.network.client; import java.io.IOException; import java.net.UnknownHostException; import java.util.Random; -import common.ConsumerSignal; -import common.Signal; -import game.Game; -import game.Player; -import network.protocol.packets.ChangeCellPacket; -import network.protocol.packets.LoginPacket; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.common.ConsumerSignal; +import org.polytech.ryuk.common.Signal; +import org.polytech.ryuk.game.Game; +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket; +import org.polytech.ryuk.network.protocol.packets.LoginPacket; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class Client { private final ClientConnexion clientConnection; diff --git a/app/src/main/java/network/client/ClientConnexion.java b/app/src/main/java/org/polytech/ryuk/network/client/ClientConnexion.java similarity index 72% rename from app/src/main/java/network/client/ClientConnexion.java rename to app/src/main/java/org/polytech/ryuk/network/client/ClientConnexion.java index 71945ff..514e958 100644 --- a/app/src/main/java/network/client/ClientConnexion.java +++ b/app/src/main/java/org/polytech/ryuk/network/client/ClientConnexion.java @@ -1,22 +1,22 @@ -package network.client; +package org.polytech.ryuk.network.client; import java.io.IOException; import java.net.Socket; import java.net.UnknownHostException; -import game.Player; -import network.Connexion; -import network.protocol.packets.ChangeCellPacket; -import network.protocol.packets.ConnexionInfoPacket; -import network.protocol.packets.DisconnectPacket; -import network.protocol.packets.EndGamePacket; -import network.protocol.packets.KeepAlivePacket; -import network.protocol.packets.LoginPacket; -import network.protocol.packets.PlayerJoinPacket; -import network.protocol.packets.PlayerLeavePacket; -import network.protocol.packets.StartGamePacket; -import network.protocol.packets.UpdatePlayerScorePacket; -import sudoku.io.SudokuSerializer; +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.network.Connexion; +import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket; +import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket; +import org.polytech.ryuk.network.protocol.packets.DisconnectPacket; +import org.polytech.ryuk.network.protocol.packets.EndGamePacket; +import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket; +import org.polytech.ryuk.network.protocol.packets.LoginPacket; +import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket; +import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket; +import org.polytech.ryuk.network.protocol.packets.StartGamePacket; +import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; public class ClientConnexion extends Connexion { diff --git a/app/src/main/java/network/protocol/Packet.java b/app/src/main/java/org/polytech/ryuk/network/protocol/Packet.java similarity index 80% rename from app/src/main/java/network/protocol/Packet.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/Packet.java index d7b4c19..60d763b 100644 --- a/app/src/main/java/network/protocol/Packet.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/Packet.java @@ -1,4 +1,4 @@ -package network.protocol; +package org.polytech.ryuk.network.protocol; import java.io.Serializable; diff --git a/app/src/main/java/org/polytech/ryuk/network/protocol/PacketVisitor.java b/app/src/main/java/org/polytech/ryuk/network/protocol/PacketVisitor.java new file mode 100644 index 0000000..9bdf7a0 --- /dev/null +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/PacketVisitor.java @@ -0,0 +1,31 @@ +package org.polytech.ryuk.network.protocol; + +import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket; +import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket; +import org.polytech.ryuk.network.protocol.packets.DisconnectPacket; +import org.polytech.ryuk.network.protocol.packets.EndGamePacket; +import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket; +import org.polytech.ryuk.network.protocol.packets.LoginPacket; +import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket; +import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket; +import org.polytech.ryuk.network.protocol.packets.StartGamePacket; +import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket; + +public interface PacketVisitor { + + default void visit(Packet packet) { + packet.accept(this); + } + + void visitPacket(ConnexionInfoPacket packet); + void visitPacket(DisconnectPacket packet); + void visitPacket(KeepAlivePacket packet); + void visitPacket(LoginPacket packet); + void visitPacket(PlayerJoinPacket packet); + void visitPacket(PlayerLeavePacket packet); + void visitPacket(StartGamePacket packet); + void visitPacket(EndGamePacket packet); + void visitPacket(UpdatePlayerScorePacket packet); + void visitPacket(ChangeCellPacket packet); + +} diff --git a/app/src/main/java/network/protocol/Packets.java b/app/src/main/java/org/polytech/ryuk/network/protocol/Packets.java similarity index 77% rename from app/src/main/java/network/protocol/Packets.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/Packets.java index 6f056e8..3357bfd 100644 --- a/app/src/main/java/network/protocol/Packets.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/Packets.java @@ -1,4 +1,4 @@ -package network.protocol; +package org.polytech.ryuk.network.protocol; public enum Packets { diff --git a/app/src/main/java/network/protocol/packets/ChangeCellPacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/ChangeCellPacket.java similarity index 75% rename from app/src/main/java/network/protocol/packets/ChangeCellPacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/ChangeCellPacket.java index 6d1164e..e594513 100644 --- a/app/src/main/java/network/protocol/packets/ChangeCellPacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/ChangeCellPacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class ChangeCellPacket extends Packet { diff --git a/app/src/main/java/network/protocol/packets/ConnexionInfoPacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/ConnexionInfoPacket.java similarity index 66% rename from app/src/main/java/network/protocol/packets/ConnexionInfoPacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/ConnexionInfoPacket.java index 5be408b..b8b7f25 100644 --- a/app/src/main/java/network/protocol/packets/ConnexionInfoPacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/ConnexionInfoPacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class ConnexionInfoPacket extends Packet { diff --git a/app/src/main/java/network/protocol/packets/DisconnectPacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/DisconnectPacket.java similarity index 64% rename from app/src/main/java/network/protocol/packets/DisconnectPacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/DisconnectPacket.java index bcec9ba..dd78d66 100644 --- a/app/src/main/java/network/protocol/packets/DisconnectPacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/DisconnectPacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class DisconnectPacket extends Packet { diff --git a/app/src/main/java/network/protocol/packets/EndGamePacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/EndGamePacket.java similarity index 54% rename from app/src/main/java/network/protocol/packets/EndGamePacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/EndGamePacket.java index 42f5066..0d8f0b3 100644 --- a/app/src/main/java/network/protocol/packets/EndGamePacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/EndGamePacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class EndGamePacket extends Packet { diff --git a/app/src/main/java/network/protocol/packets/KeepAlivePacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/KeepAlivePacket.java similarity index 65% rename from app/src/main/java/network/protocol/packets/KeepAlivePacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/KeepAlivePacket.java index 5804470..0eb54b1 100644 --- a/app/src/main/java/network/protocol/packets/KeepAlivePacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/KeepAlivePacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class KeepAlivePacket extends Packet { diff --git a/app/src/main/java/network/protocol/packets/LoginPacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/LoginPacket.java similarity index 63% rename from app/src/main/java/network/protocol/packets/LoginPacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/LoginPacket.java index 237dd3f..bfa53e9 100644 --- a/app/src/main/java/network/protocol/packets/LoginPacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/LoginPacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class LoginPacket extends Packet { diff --git a/app/src/main/java/network/protocol/packets/PlayerJoinPacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerJoinPacket.java similarity index 60% rename from app/src/main/java/network/protocol/packets/PlayerJoinPacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerJoinPacket.java index 4badf2d..1c88e5e 100644 --- a/app/src/main/java/network/protocol/packets/PlayerJoinPacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerJoinPacket.java @@ -1,9 +1,9 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import game.Player; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class PlayerJoinPacket extends Packet{ diff --git a/app/src/main/java/network/protocol/packets/PlayerLeavePacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerLeavePacket.java similarity index 64% rename from app/src/main/java/network/protocol/packets/PlayerLeavePacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerLeavePacket.java index b22b7cc..274fa61 100644 --- a/app/src/main/java/network/protocol/packets/PlayerLeavePacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/PlayerLeavePacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class PlayerLeavePacket extends Packet{ diff --git a/app/src/main/java/network/protocol/packets/StartGamePacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/StartGamePacket.java similarity index 78% rename from app/src/main/java/network/protocol/packets/StartGamePacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/StartGamePacket.java index 3832240..dd15fac 100644 --- a/app/src/main/java/network/protocol/packets/StartGamePacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/StartGamePacket.java @@ -1,10 +1,10 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; import java.time.Instant; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class StartGamePacket extends Packet { diff --git a/app/src/main/java/network/protocol/packets/UpdatePlayerScorePacket.java b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/UpdatePlayerScorePacket.java similarity index 71% rename from app/src/main/java/network/protocol/packets/UpdatePlayerScorePacket.java rename to app/src/main/java/org/polytech/ryuk/network/protocol/packets/UpdatePlayerScorePacket.java index f8011df..ec135d3 100644 --- a/app/src/main/java/network/protocol/packets/UpdatePlayerScorePacket.java +++ b/app/src/main/java/org/polytech/ryuk/network/protocol/packets/UpdatePlayerScorePacket.java @@ -1,8 +1,8 @@ -package network.protocol.packets; +package org.polytech.ryuk.network.protocol.packets; -import network.protocol.Packet; -import network.protocol.PacketVisitor; -import network.protocol.Packets; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.PacketVisitor; +import org.polytech.ryuk.network.protocol.Packets; public class UpdatePlayerScorePacket extends Packet { diff --git a/app/src/main/java/network/server/KeepAliveHandler.java b/app/src/main/java/org/polytech/ryuk/network/server/KeepAliveHandler.java similarity index 90% rename from app/src/main/java/network/server/KeepAliveHandler.java rename to app/src/main/java/org/polytech/ryuk/network/server/KeepAliveHandler.java index ae1ba22..c77d245 100644 --- a/app/src/main/java/network/server/KeepAliveHandler.java +++ b/app/src/main/java/org/polytech/ryuk/network/server/KeepAliveHandler.java @@ -1,8 +1,8 @@ -package network.server; +package org.polytech.ryuk.network.server; import java.util.Random; -import network.protocol.packets.KeepAlivePacket; +import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket; public class KeepAliveHandler { diff --git a/app/src/main/java/network/server/Server.java b/app/src/main/java/org/polytech/ryuk/network/server/Server.java similarity index 83% rename from app/src/main/java/network/server/Server.java rename to app/src/main/java/org/polytech/ryuk/network/server/Server.java index 7c746be..78ef3cc 100644 --- a/app/src/main/java/network/server/Server.java +++ b/app/src/main/java/org/polytech/ryuk/network/server/Server.java @@ -1,4 +1,4 @@ -package network.server; +package org.polytech.ryuk.network.server; import java.io.IOException; import java.net.ServerSocket; @@ -6,14 +6,14 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; -import game.Game; -import game.Player; -import game.Game.GameState; -import network.protocol.Packet; -import network.protocol.packets.EndGamePacket; -import network.protocol.packets.StartGamePacket; -import sudoku.io.SudokuSerializer; -import sudoku.structure.MultiDoku; +import org.polytech.ryuk.game.Game; +import org.polytech.ryuk.game.Game.GameState; +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.network.protocol.Packet; +import org.polytech.ryuk.network.protocol.packets.EndGamePacket; +import org.polytech.ryuk.network.protocol.packets.StartGamePacket; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; +import org.polytech.ryuk.sudoku.structure.MultiDoku; public class Server { diff --git a/app/src/main/java/network/server/ServerAcceptThread.java b/app/src/main/java/org/polytech/ryuk/network/server/ServerAcceptThread.java similarity index 94% rename from app/src/main/java/network/server/ServerAcceptThread.java rename to app/src/main/java/org/polytech/ryuk/network/server/ServerAcceptThread.java index 61800db..bd70713 100644 --- a/app/src/main/java/network/server/ServerAcceptThread.java +++ b/app/src/main/java/org/polytech/ryuk/network/server/ServerAcceptThread.java @@ -1,4 +1,4 @@ -package network.server; +package org.polytech.ryuk.network.server; import java.io.IOException; import java.net.Socket; diff --git a/app/src/main/java/network/server/ServerConnexion.java b/app/src/main/java/org/polytech/ryuk/network/server/ServerConnexion.java similarity index 81% rename from app/src/main/java/network/server/ServerConnexion.java rename to app/src/main/java/org/polytech/ryuk/network/server/ServerConnexion.java index 68de01b..97109ae 100644 --- a/app/src/main/java/network/server/ServerConnexion.java +++ b/app/src/main/java/org/polytech/ryuk/network/server/ServerConnexion.java @@ -1,25 +1,25 @@ -package network.server; +package org.polytech.ryuk.network.server; import java.io.IOException; import java.net.Socket; -import game.Game; -import game.Player; -import game.Game.GameState; -import network.Connexion; -import network.protocol.packets.ChangeCellPacket; -import network.protocol.packets.ConnexionInfoPacket; -import network.protocol.packets.DisconnectPacket; -import network.protocol.packets.EndGamePacket; -import network.protocol.packets.KeepAlivePacket; -import network.protocol.packets.LoginPacket; -import network.protocol.packets.PlayerJoinPacket; -import network.protocol.packets.PlayerLeavePacket; -import network.protocol.packets.StartGamePacket; -import network.protocol.packets.UpdatePlayerScorePacket; -import sudoku.io.SudokuSerializer; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; +import org.polytech.ryuk.game.Game; +import org.polytech.ryuk.game.Game.GameState; +import org.polytech.ryuk.game.Player; +import org.polytech.ryuk.network.Connexion; +import org.polytech.ryuk.network.protocol.packets.ChangeCellPacket; +import org.polytech.ryuk.network.protocol.packets.ConnexionInfoPacket; +import org.polytech.ryuk.network.protocol.packets.DisconnectPacket; +import org.polytech.ryuk.network.protocol.packets.EndGamePacket; +import org.polytech.ryuk.network.protocol.packets.KeepAlivePacket; +import org.polytech.ryuk.network.protocol.packets.LoginPacket; +import org.polytech.ryuk.network.protocol.packets.PlayerJoinPacket; +import org.polytech.ryuk.network.protocol.packets.PlayerLeavePacket; +import org.polytech.ryuk.network.protocol.packets.StartGamePacket; +import org.polytech.ryuk.network.protocol.packets.UpdatePlayerScorePacket; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; public class ServerConnexion extends Connexion { diff --git a/app/src/main/java/network/server/ServerLogicThread.java b/app/src/main/java/org/polytech/ryuk/network/server/ServerLogicThread.java similarity index 90% rename from app/src/main/java/network/server/ServerLogicThread.java rename to app/src/main/java/org/polytech/ryuk/network/server/ServerLogicThread.java index d238ca2..d3d96e6 100644 --- a/app/src/main/java/network/server/ServerLogicThread.java +++ b/app/src/main/java/org/polytech/ryuk/network/server/ServerLogicThread.java @@ -1,4 +1,4 @@ -package network.server; +package org.polytech.ryuk.network.server; public class ServerLogicThread extends Thread { diff --git a/app/src/main/java/sudoku/Main.java b/app/src/main/java/org/polytech/ryuk/sudoku/Main.java similarity index 77% rename from app/src/main/java/sudoku/Main.java rename to app/src/main/java/org/polytech/ryuk/sudoku/Main.java index 3f9ecbf..1bfbe75 100644 --- a/app/src/main/java/sudoku/Main.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/Main.java @@ -1,9 +1,9 @@ /* * This Java source file was generated by the Gradle 'init' task. */ -package sudoku; +package org.polytech.ryuk.sudoku; -import sudoku.io.ConsoleInterface; +import org.polytech.ryuk.sudoku.io.ConsoleInterface; public class Main { public String getGreeting() { diff --git a/app/src/main/java/sudoku/constraint/BlockConstraint.java b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/BlockConstraint.java similarity index 62% rename from app/src/main/java/sudoku/constraint/BlockConstraint.java rename to app/src/main/java/org/polytech/ryuk/sudoku/constraint/BlockConstraint.java index 2ea7d66..b1be839 100644 --- a/app/src/main/java/sudoku/constraint/BlockConstraint.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/BlockConstraint.java @@ -1,7 +1,7 @@ -package sudoku.constraint; +package org.polytech.ryuk.sudoku.constraint; -import sudoku.structure.Block; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.Block; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class BlockConstraint implements IConstraint{ diff --git a/app/src/main/java/sudoku/constraint/ColumnConstraint.java b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/ColumnConstraint.java similarity index 70% rename from app/src/main/java/sudoku/constraint/ColumnConstraint.java rename to app/src/main/java/org/polytech/ryuk/sudoku/constraint/ColumnConstraint.java index 19d3aff..88cead7 100644 --- a/app/src/main/java/sudoku/constraint/ColumnConstraint.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/ColumnConstraint.java @@ -1,7 +1,7 @@ -package sudoku.constraint; +package org.polytech.ryuk.sudoku.constraint; -import sudoku.structure.Cell; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class ColumnConstraint implements IConstraint { diff --git a/app/src/main/java/sudoku/constraint/Constraint.java b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/Constraint.java similarity index 92% rename from app/src/main/java/sudoku/constraint/Constraint.java rename to app/src/main/java/org/polytech/ryuk/sudoku/constraint/Constraint.java index 14b7c3d..eb139f6 100644 --- a/app/src/main/java/sudoku/constraint/Constraint.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/Constraint.java @@ -1,8 +1,8 @@ -package sudoku.constraint; +package org.polytech.ryuk.sudoku.constraint; import java.util.List; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public enum Constraint { diff --git a/app/src/main/java/sudoku/constraint/DiagonalConstraint.java b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/DiagonalConstraint.java similarity index 84% rename from app/src/main/java/sudoku/constraint/DiagonalConstraint.java rename to app/src/main/java/org/polytech/ryuk/sudoku/constraint/DiagonalConstraint.java index 95d6842..3da3d52 100644 --- a/app/src/main/java/sudoku/constraint/DiagonalConstraint.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/DiagonalConstraint.java @@ -1,6 +1,6 @@ -package sudoku.constraint; +package org.polytech.ryuk.sudoku.constraint; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class DiagonalConstraint implements IConstraint { diff --git a/app/src/main/java/sudoku/constraint/IConstraint.java b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/IConstraint.java similarity index 81% rename from app/src/main/java/sudoku/constraint/IConstraint.java rename to app/src/main/java/org/polytech/ryuk/sudoku/constraint/IConstraint.java index 7b80652..5efd6f4 100644 --- a/app/src/main/java/sudoku/constraint/IConstraint.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/IConstraint.java @@ -1,9 +1,9 @@ -package sudoku.constraint; +package org.polytech.ryuk.sudoku.constraint; import java.util.ArrayList; import java.util.List; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public interface IConstraint { diff --git a/app/src/main/java/sudoku/constraint/LineConstraint.java b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/LineConstraint.java similarity index 75% rename from app/src/main/java/sudoku/constraint/LineConstraint.java rename to app/src/main/java/org/polytech/ryuk/sudoku/constraint/LineConstraint.java index 694b24f..5a3c52f 100644 --- a/app/src/main/java/sudoku/constraint/LineConstraint.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/constraint/LineConstraint.java @@ -1,6 +1,6 @@ -package sudoku.constraint; +package org.polytech.ryuk.sudoku.constraint; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class LineConstraint implements IConstraint { diff --git a/app/src/main/java/sudoku/io/ConsoleInterface.java b/app/src/main/java/org/polytech/ryuk/sudoku/io/ConsoleInterface.java similarity index 93% rename from app/src/main/java/sudoku/io/ConsoleInterface.java rename to app/src/main/java/org/polytech/ryuk/sudoku/io/ConsoleInterface.java index 82c62b5..26ae997 100644 --- a/app/src/main/java/sudoku/io/ConsoleInterface.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/io/ConsoleInterface.java @@ -1,15 +1,15 @@ -package sudoku.io; +package org.polytech.ryuk.sudoku.io; import java.util.ArrayList; import java.util.List; import java.util.Scanner; -import sudoku.constraint.Constraint; -import sudoku.solver.RandomSolver; -import sudoku.structure.Difficulty; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; -import sudoku.structure.SudokuFactory; +import org.polytech.ryuk.sudoku.constraint.Constraint; +import org.polytech.ryuk.sudoku.solver.RandomSolver; +import org.polytech.ryuk.sudoku.structure.Difficulty; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.SudokuFactory; public class ConsoleInterface { public Scanner reader = new Scanner(System.in); diff --git a/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuFile.java b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuFile.java new file mode 100644 index 0000000..360ef82 --- /dev/null +++ b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuFile.java @@ -0,0 +1,7 @@ +package org.polytech.ryuk.sudoku.io; + +public class SudokuFile { + + + +} diff --git a/app/src/main/java/sudoku/io/SudokuPrinter.java b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuPrinter.java similarity index 91% rename from app/src/main/java/sudoku/io/SudokuPrinter.java rename to app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuPrinter.java index 6cec63f..8a562df 100644 --- a/app/src/main/java/sudoku/io/SudokuPrinter.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuPrinter.java @@ -1,7 +1,7 @@ -package sudoku.io; +package org.polytech.ryuk.sudoku.io; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class SudokuPrinter { diff --git a/app/src/main/java/sudoku/io/SudokuSave.java b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSave.java similarity index 83% rename from app/src/main/java/sudoku/io/SudokuSave.java rename to app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSave.java index 1f5019e..5d016ed 100644 --- a/app/src/main/java/sudoku/io/SudokuSave.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSave.java @@ -1,4 +1,4 @@ -package sudoku.io; +package org.polytech.ryuk.sudoku.io; public class SudokuSave { diff --git a/app/src/main/java/sudoku/io/SudokuSerializer.java b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSerializer.java similarity index 95% rename from app/src/main/java/sudoku/io/SudokuSerializer.java rename to app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSerializer.java index 96ac2c5..c837762 100644 --- a/app/src/main/java/sudoku/io/SudokuSerializer.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/io/SudokuSerializer.java @@ -1,4 +1,4 @@ -package sudoku.io; +package org.polytech.ryuk.sudoku.io; import java.io.File; import java.io.FileWriter; @@ -10,12 +10,11 @@ import java.util.List; import org.json.JSONArray; import org.json.JSONObject; - -import sudoku.constraint.Constraint; -import sudoku.structure.Block; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.constraint.Constraint; +import org.polytech.ryuk.sudoku.structure.Block; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class SudokuSerializer { diff --git a/app/src/main/java/sudoku/solver/BacktrackingSolver.java b/app/src/main/java/org/polytech/ryuk/sudoku/solver/BacktrackingSolver.java similarity index 87% rename from app/src/main/java/sudoku/solver/BacktrackingSolver.java rename to app/src/main/java/org/polytech/ryuk/sudoku/solver/BacktrackingSolver.java index 750a8aa..ac836d1 100644 --- a/app/src/main/java/sudoku/solver/BacktrackingSolver.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/solver/BacktrackingSolver.java @@ -1,10 +1,10 @@ -package sudoku.solver; +package org.polytech.ryuk.sudoku.solver; import java.util.List; import java.util.concurrent.CancellationException; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; public class BacktrackingSolver implements Solver { diff --git a/app/src/main/java/sudoku/solver/HumanSolver.java b/app/src/main/java/org/polytech/ryuk/sudoku/solver/HumanSolver.java similarity index 83% rename from app/src/main/java/sudoku/solver/HumanSolver.java rename to app/src/main/java/org/polytech/ryuk/sudoku/solver/HumanSolver.java index 589d932..a399934 100644 --- a/app/src/main/java/sudoku/solver/HumanSolver.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/solver/HumanSolver.java @@ -1,13 +1,13 @@ -package sudoku.solver; +package org.polytech.ryuk.sudoku.solver; import java.util.List; import java.util.concurrent.CancellationException; import java.util.logging.Level; -import sudoku.io.SudokuPrinter; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.io.SudokuPrinter; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class HumanSolver implements Solver { diff --git a/app/src/main/java/sudoku/solver/MixedSolver.java b/app/src/main/java/org/polytech/ryuk/sudoku/solver/MixedSolver.java similarity index 89% rename from app/src/main/java/sudoku/solver/MixedSolver.java rename to app/src/main/java/org/polytech/ryuk/sudoku/solver/MixedSolver.java index 87351d7..196b393 100644 --- a/app/src/main/java/sudoku/solver/MixedSolver.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/solver/MixedSolver.java @@ -1,14 +1,14 @@ -package sudoku.solver; +package org.polytech.ryuk.sudoku.solver; import java.util.List; import java.util.Random; import java.util.concurrent.CancellationException; import java.util.logging.Level; -import sudoku.io.SudokuPrinter; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.io.SudokuPrinter; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class MixedSolver implements Solver{ diff --git a/app/src/main/java/sudoku/solver/RandomSolver.java b/app/src/main/java/org/polytech/ryuk/sudoku/solver/RandomSolver.java similarity index 88% rename from app/src/main/java/sudoku/solver/RandomSolver.java rename to app/src/main/java/org/polytech/ryuk/sudoku/solver/RandomSolver.java index 275d928..d2c87b7 100644 --- a/app/src/main/java/sudoku/solver/RandomSolver.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/solver/RandomSolver.java @@ -1,14 +1,14 @@ -package sudoku.solver; +package org.polytech.ryuk.sudoku.solver; import java.util.List; import java.util.Random; import java.util.concurrent.CancellationException; import java.util.logging.Level; -import sudoku.io.SudokuPrinter; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.io.SudokuPrinter; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; public class RandomSolver implements Solver { diff --git a/app/src/main/java/sudoku/solver/Solver.java b/app/src/main/java/org/polytech/ryuk/sudoku/solver/Solver.java similarity index 88% rename from app/src/main/java/sudoku/solver/Solver.java rename to app/src/main/java/org/polytech/ryuk/sudoku/solver/Solver.java index 8ea6bde..f734773 100644 --- a/app/src/main/java/sudoku/solver/Solver.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/solver/Solver.java @@ -1,10 +1,10 @@ -package sudoku.solver; +package org.polytech.ryuk.sudoku.solver; import java.util.List; import java.util.logging.Logger; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; public interface Solver { diff --git a/app/src/main/java/sudoku/solver/StupidSolver.java b/app/src/main/java/org/polytech/ryuk/sudoku/solver/StupidSolver.java similarity index 88% rename from app/src/main/java/sudoku/solver/StupidSolver.java rename to app/src/main/java/org/polytech/ryuk/sudoku/solver/StupidSolver.java index 8fed0b8..9a9ca9c 100644 --- a/app/src/main/java/sudoku/solver/StupidSolver.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/solver/StupidSolver.java @@ -1,9 +1,9 @@ -package sudoku.solver; +package org.polytech.ryuk.sudoku.solver; import java.util.concurrent.CancellationException; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; /** * Class de test non utilisé diff --git a/app/src/main/java/sudoku/structure/Block.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Block.java similarity index 96% rename from app/src/main/java/sudoku/structure/Block.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/Block.java index 98acdbd..5fdedb5 100644 --- a/app/src/main/java/sudoku/structure/Block.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Block.java @@ -1,4 +1,4 @@ -package sudoku.structure; +package org.polytech.ryuk.sudoku.structure; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/sudoku/structure/Cell.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Cell.java similarity index 98% rename from app/src/main/java/sudoku/structure/Cell.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/Cell.java index b6127ad..7605b99 100644 --- a/app/src/main/java/sudoku/structure/Cell.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Cell.java @@ -1,4 +1,4 @@ -package sudoku.structure; +package org.polytech.ryuk.sudoku.structure; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/sudoku/structure/Coordinate.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Coordinate.java similarity index 95% rename from app/src/main/java/sudoku/structure/Coordinate.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/Coordinate.java index 40323f5..f2381b3 100644 --- a/app/src/main/java/sudoku/structure/Coordinate.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Coordinate.java @@ -1,4 +1,4 @@ -package sudoku.structure; +package org.polytech.ryuk.sudoku.structure; /** * Représente les coordonnées d'une Cell diff --git a/app/src/main/java/sudoku/structure/Difficulty.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Difficulty.java similarity index 94% rename from app/src/main/java/sudoku/structure/Difficulty.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/Difficulty.java index a39615d..abd3e87 100644 --- a/app/src/main/java/sudoku/structure/Difficulty.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Difficulty.java @@ -1,4 +1,4 @@ -package sudoku.structure; +package org.polytech.ryuk.sudoku.structure; //TODO: melvyn va passer par là public enum Difficulty { diff --git a/app/src/main/java/sudoku/structure/MultiDoku.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/MultiDoku.java similarity index 97% rename from app/src/main/java/sudoku/structure/MultiDoku.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/MultiDoku.java index d817eb7..ae89631 100644 --- a/app/src/main/java/sudoku/structure/MultiDoku.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/MultiDoku.java @@ -1,4 +1,4 @@ -package sudoku.structure; +package org.polytech.ryuk.sudoku.structure; import java.util.ArrayList; import java.util.HashSet; @@ -6,7 +6,7 @@ import java.util.List; import java.util.Random; import java.util.Set; -import sudoku.io.SudokuSerializer; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; /** * @class MultiDoku diff --git a/app/src/main/java/sudoku/structure/StateManager.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/StateManager.java similarity index 94% rename from app/src/main/java/sudoku/structure/StateManager.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/StateManager.java index 8ea9feb..659dd45 100644 --- a/app/src/main/java/sudoku/structure/StateManager.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/StateManager.java @@ -1,4 +1,4 @@ -package sudoku.structure; +package org.polytech.ryuk.sudoku.structure; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/sudoku/structure/Sudoku.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Sudoku.java similarity index 97% rename from app/src/main/java/sudoku/structure/Sudoku.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/Sudoku.java index 3458d40..13775b7 100644 --- a/app/src/main/java/sudoku/structure/Sudoku.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/Sudoku.java @@ -1,13 +1,10 @@ -package sudoku.structure; - -import sudoku.constraint.BlockConstraint; -import sudoku.constraint.Constraint; -import sudoku.constraint.IConstraint; -import sudoku.io.SudokuPrinter; +package org.polytech.ryuk.sudoku.structure; import java.util.ArrayList; import java.util.List; +import org.polytech.ryuk.sudoku.constraint.Constraint; + /** * @class Sudoku * @brief Représent un Sudoku diff --git a/app/src/main/java/sudoku/structure/SudokuFactory.java b/app/src/main/java/org/polytech/ryuk/sudoku/structure/SudokuFactory.java similarity index 97% rename from app/src/main/java/sudoku/structure/SudokuFactory.java rename to app/src/main/java/org/polytech/ryuk/sudoku/structure/SudokuFactory.java index d259bfb..908f2d1 100644 --- a/app/src/main/java/sudoku/structure/SudokuFactory.java +++ b/app/src/main/java/org/polytech/ryuk/sudoku/structure/SudokuFactory.java @@ -1,4 +1,4 @@ -package sudoku.structure; +package org.polytech.ryuk.sudoku.structure; import java.io.IOException; import java.nio.file.Files; @@ -9,10 +9,10 @@ import java.util.List; import java.util.Map; import java.util.Random; -import sudoku.constraint.Constraint; -import sudoku.io.SudokuSerializer; -import sudoku.solver.RandomSolver; -import sudoku.solver.Solver; +import org.polytech.ryuk.sudoku.constraint.Constraint; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; +import org.polytech.ryuk.sudoku.solver.RandomSolver; +import org.polytech.ryuk.sudoku.solver.Solver; public class SudokuFactory { diff --git a/app/src/main/java/sudoku/io/SudokuFile.java b/app/src/main/java/sudoku/io/SudokuFile.java deleted file mode 100644 index 2b4e015..0000000 --- a/app/src/main/java/sudoku/io/SudokuFile.java +++ /dev/null @@ -1,7 +0,0 @@ -package sudoku.io; - -public class SudokuFile { - - - -} diff --git a/app/src/test/java/sudoku/AppTest.java b/app/src/test/java/sudoku/AppTest.java deleted file mode 100644 index 72972c3..0000000 --- a/app/src/test/java/sudoku/AppTest.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ -package sudoku; - -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -class AppTest { - @Test void appHasAGreeting() { - Main classUnderTest = new Main(); - assertNotNull(classUnderTest.getGreeting(), "app should have a greeting"); - } -} diff --git a/app/src/test/java/sudoku/SudokuSerializerTest.java b/app/src/test/java/sudoku/SudokuSerializerTest.java index d39bf79..631bc84 100644 --- a/app/src/test/java/sudoku/SudokuSerializerTest.java +++ b/app/src/test/java/sudoku/SudokuSerializerTest.java @@ -8,11 +8,10 @@ import java.util.Random; import org.json.JSONObject; import org.junit.jupiter.api.Test; - -import sudoku.io.SudokuSerializer; -import sudoku.solver.RandomSolver; -import sudoku.structure.MultiDoku; -import sudoku.structure.SudokuFactory; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; +import org.polytech.ryuk.sudoku.solver.RandomSolver; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.SudokuFactory; public class SudokuSerializerTest { diff --git a/app/src/test/java/sudoku/solver/SolverTest.java b/app/src/test/java/sudoku/solver/SolverTest.java index 6b64c55..bdd6975 100644 --- a/app/src/test/java/sudoku/solver/SolverTest.java +++ b/app/src/test/java/sudoku/solver/SolverTest.java @@ -1,18 +1,19 @@ package sudoku.solver; -import org.junit.jupiter.api.Test; -import sudoku.io.SudokuPrinter; -import sudoku.io.SudokuSerializer; -import sudoku.structure.Cell; -import sudoku.structure.MultiDoku; -import sudoku.structure.Sudoku; -import sudoku.structure.SudokuFactory; - import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import java.util.Random; +import org.junit.jupiter.api.Test; +import org.polytech.ryuk.sudoku.io.SudokuPrinter; +import org.polytech.ryuk.sudoku.io.SudokuSerializer; +import org.polytech.ryuk.sudoku.solver.RandomSolver; +import org.polytech.ryuk.sudoku.structure.Cell; +import org.polytech.ryuk.sudoku.structure.MultiDoku; +import org.polytech.ryuk.sudoku.structure.Sudoku; +import org.polytech.ryuk.sudoku.structure.SudokuFactory; + class SolverTest { @Test