diff --git a/client-api/pom.xml b/api/pom.xml similarity index 87% rename from client-api/pom.xml rename to api/pom.xml index d58147f..ce3f672 100644 --- a/client-api/pom.xml +++ b/api/pom.xml @@ -8,8 +8,8 @@ 1.0 - lingo-client-api - Lingo :: Client API + lingo-api + Lingo :: API diff --git a/client-api/src/main/java/lingo/client/api/Destinations.java b/api/src/main/java/com/charego/lingo/api/Destinations.java similarity index 97% rename from client-api/src/main/java/lingo/client/api/Destinations.java rename to api/src/main/java/com/charego/lingo/api/Destinations.java index eb1fad5..f8f9686 100644 --- a/client-api/src/main/java/lingo/client/api/Destinations.java +++ b/api/src/main/java/com/charego/lingo/api/Destinations.java @@ -1,4 +1,4 @@ -package lingo.client.api; +package com.charego.lingo.api; public class Destinations { diff --git a/client/pom.xml b/client/pom.xml index 871a26c..7d6fb90 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -19,7 +19,7 @@ ${project.groupId} ${project.version} - lingo-client-api + lingo-api @@ -53,7 +53,7 @@ javafx-maven-plugin 8.8.3 - lingo.client.bootstrap.LingoClient + com.charego.lingo.client.bootstrap.LingoClient src/main/config true diff --git a/client/src/main/java/lingo/client/bootstrap/LingoClient.java b/client/src/main/java/com/charego/lingo/client/bootstrap/LingoClient.java similarity index 97% rename from client/src/main/java/lingo/client/bootstrap/LingoClient.java rename to client/src/main/java/com/charego/lingo/client/bootstrap/LingoClient.java index 3e72965..9211767 100644 --- a/client/src/main/java/lingo/client/bootstrap/LingoClient.java +++ b/client/src/main/java/com/charego/lingo/client/bootstrap/LingoClient.java @@ -1,4 +1,4 @@ -package lingo.client.bootstrap; +package com.charego.lingo.client.bootstrap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/client/src/main/java/lingo/client/bootstrap/LingoPresenter.java b/client/src/main/java/com/charego/lingo/client/bootstrap/LingoPresenter.java similarity index 89% rename from client/src/main/java/lingo/client/bootstrap/LingoPresenter.java rename to client/src/main/java/com/charego/lingo/client/bootstrap/LingoPresenter.java index 30dad88..9444fa5 100644 --- a/client/src/main/java/lingo/client/bootstrap/LingoPresenter.java +++ b/client/src/main/java/com/charego/lingo/client/bootstrap/LingoPresenter.java @@ -1,10 +1,15 @@ -package lingo.client.bootstrap; +package com.charego.lingo.client.bootstrap; import java.io.IOException; import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; +import com.charego.lingo.client.multiplayer.MultiplayerConfig; +import com.charego.lingo.client.multiplayer.MultiplayerPresenter; +import com.charego.lingo.client.singleplayer.SinglePlayerPresenter; +import com.charego.lingo.client.util.FxmlController; +import com.charego.lingo.common.WordReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,11 +23,6 @@ import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.layout.BorderPane; import javafx.stage.Stage; -import lingo.client.multiplayer.MultiplayerConfig; -import lingo.client.multiplayer.MultiplayerPresenter; -import lingo.client.singleplayer.SinglePlayerPresenter; -import lingo.client.util.FxmlController; -import lingo.common.WordReader; @Component public class LingoPresenter implements FxmlController { diff --git a/client/src/main/java/lingo/client/multiplayer/MultiplayerConfig.java b/client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerConfig.java similarity index 98% rename from client/src/main/java/lingo/client/multiplayer/MultiplayerConfig.java rename to client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerConfig.java index ee1503e..d8a646d 100644 --- a/client/src/main/java/lingo/client/multiplayer/MultiplayerConfig.java +++ b/client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerConfig.java @@ -1,4 +1,4 @@ -package lingo.client.multiplayer; +package com.charego.lingo.client.multiplayer; import java.util.ArrayList; import java.util.List; diff --git a/client/src/main/java/lingo/client/multiplayer/MultiplayerPresenter.java b/client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerPresenter.java similarity index 96% rename from client/src/main/java/lingo/client/multiplayer/MultiplayerPresenter.java rename to client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerPresenter.java index 4648c11..590c57f 100644 --- a/client/src/main/java/lingo/client/multiplayer/MultiplayerPresenter.java +++ b/client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerPresenter.java @@ -1,4 +1,4 @@ -package lingo.client.multiplayer; +package com.charego.lingo.client.multiplayer; import java.lang.reflect.Type; import java.util.Arrays; @@ -36,14 +36,14 @@ import javafx.scene.paint.Color; import javafx.scene.text.Font; import javafx.scene.text.TextAlignment; import javafx.scene.web.WebView; -import lingo.client.api.Destinations; -import lingo.client.util.FxmlController; -import lingo.client.view.Board; -import lingo.client.view.OpponentBoard; -import lingo.client.view.PlayerBoard; -import lingo.common.Game; -import lingo.common.GameLeftMessage; -import lingo.common.Report; +import com.charego.lingo.api.Destinations; +import com.charego.lingo.client.util.FxmlController; +import com.charego.lingo.client.view.Board; +import com.charego.lingo.client.view.OpponentBoard; +import com.charego.lingo.client.view.PlayerBoard; +import com.charego.lingo.common.Game; +import com.charego.lingo.common.GameLeftMessage; +import com.charego.lingo.common.Report; @Component public class MultiplayerPresenter implements FxmlController { diff --git a/client/src/main/java/lingo/client/multiplayer/StompTemplate.java b/client/src/main/java/com/charego/lingo/client/multiplayer/StompTemplate.java similarity index 98% rename from client/src/main/java/lingo/client/multiplayer/StompTemplate.java rename to client/src/main/java/com/charego/lingo/client/multiplayer/StompTemplate.java index 5c28577..d3111d9 100644 --- a/client/src/main/java/lingo/client/multiplayer/StompTemplate.java +++ b/client/src/main/java/com/charego/lingo/client/multiplayer/StompTemplate.java @@ -1,4 +1,4 @@ -package lingo.client.multiplayer; +package com.charego.lingo.client.multiplayer; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/client/src/main/java/lingo/client/singleplayer/SinglePlayerPresenter.java b/client/src/main/java/com/charego/lingo/client/singleplayer/SinglePlayerPresenter.java similarity index 95% rename from client/src/main/java/lingo/client/singleplayer/SinglePlayerPresenter.java rename to client/src/main/java/com/charego/lingo/client/singleplayer/SinglePlayerPresenter.java index 1a302d3..8b0b3c1 100644 --- a/client/src/main/java/lingo/client/singleplayer/SinglePlayerPresenter.java +++ b/client/src/main/java/com/charego/lingo/client/singleplayer/SinglePlayerPresenter.java @@ -1,4 +1,4 @@ -package lingo.client.singleplayer; +package com.charego.lingo.client.singleplayer; import java.util.Arrays; import java.util.List; @@ -22,10 +22,10 @@ import javafx.scene.input.KeyEvent; import javafx.scene.layout.StackPane; import javafx.scene.text.Font; import javafx.scene.text.TextAlignment; -import lingo.client.view.PlayerBoard; -import lingo.common.Game; -import lingo.common.Player; -import lingo.common.Report; +import com.charego.lingo.client.view.PlayerBoard; +import com.charego.lingo.common.Game; +import com.charego.lingo.common.Player; +import com.charego.lingo.common.Report; public class SinglePlayerPresenter { diff --git a/client/src/main/java/lingo/client/util/FxmlController.java b/client/src/main/java/com/charego/lingo/client/util/FxmlController.java similarity index 95% rename from client/src/main/java/lingo/client/util/FxmlController.java rename to client/src/main/java/com/charego/lingo/client/util/FxmlController.java index d180d64..80535ca 100644 --- a/client/src/main/java/lingo/client/util/FxmlController.java +++ b/client/src/main/java/com/charego/lingo/client/util/FxmlController.java @@ -1,4 +1,4 @@ -package lingo.client.util; +package com.charego.lingo.client.util; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/client/src/main/java/lingo/client/view/Board.java b/client/src/main/java/com/charego/lingo/client/view/Board.java similarity index 94% rename from client/src/main/java/lingo/client/view/Board.java rename to client/src/main/java/com/charego/lingo/client/view/Board.java index f1f2f0a..ad05f90 100644 --- a/client/src/main/java/lingo/client/view/Board.java +++ b/client/src/main/java/com/charego/lingo/client/view/Board.java @@ -1,4 +1,4 @@ -package lingo.client.view; +package com.charego.lingo.client.view; import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; diff --git a/client/src/main/java/lingo/client/view/GameBoard.java b/client/src/main/java/com/charego/lingo/client/view/GameBoard.java similarity index 97% rename from client/src/main/java/lingo/client/view/GameBoard.java rename to client/src/main/java/com/charego/lingo/client/view/GameBoard.java index 45ac501..3dae326 100644 --- a/client/src/main/java/lingo/client/view/GameBoard.java +++ b/client/src/main/java/com/charego/lingo/client/view/GameBoard.java @@ -1,4 +1,4 @@ -package lingo.client.view; +package com.charego.lingo.client.view; import java.util.ArrayList; import java.util.List; diff --git a/client/src/main/java/lingo/client/view/OpponentBoard.java b/client/src/main/java/com/charego/lingo/client/view/OpponentBoard.java similarity index 87% rename from client/src/main/java/lingo/client/view/OpponentBoard.java rename to client/src/main/java/com/charego/lingo/client/view/OpponentBoard.java index c257f9c..35e1b65 100644 --- a/client/src/main/java/lingo/client/view/OpponentBoard.java +++ b/client/src/main/java/com/charego/lingo/client/view/OpponentBoard.java @@ -1,4 +1,4 @@ -package lingo.client.view; +package com.charego.lingo.client.view; import javafx.scene.canvas.Canvas; diff --git a/client/src/main/java/lingo/client/view/PlayerBoard.java b/client/src/main/java/com/charego/lingo/client/view/PlayerBoard.java similarity index 98% rename from client/src/main/java/lingo/client/view/PlayerBoard.java rename to client/src/main/java/com/charego/lingo/client/view/PlayerBoard.java index 89690db..1cedd31 100644 --- a/client/src/main/java/lingo/client/view/PlayerBoard.java +++ b/client/src/main/java/com/charego/lingo/client/view/PlayerBoard.java @@ -1,4 +1,4 @@ -package lingo.client.view; +package com.charego.lingo.client.view; import java.util.ArrayList; import java.util.HashMap; diff --git a/client/src/main/resources/fxml/Lingo.fxml b/client/src/main/resources/fxml/Lingo.fxml index 17afbd5..a56a7af 100644 --- a/client/src/main/resources/fxml/Lingo.fxml +++ b/client/src/main/resources/fxml/Lingo.fxml @@ -7,7 +7,7 @@ diff --git a/client/src/main/resources/fxml/LingoMultiplayer.fxml b/client/src/main/resources/fxml/LingoMultiplayer.fxml index 5b8eb36..b473e4e 100644 --- a/client/src/main/resources/fxml/LingoMultiplayer.fxml +++ b/client/src/main/resources/fxml/LingoMultiplayer.fxml @@ -8,7 +8,7 @@ diff --git a/common/src/main/java/lingo/common/ChatMessage.java b/common/src/main/java/com/charego/lingo/common/ChatMessage.java similarity index 93% rename from common/src/main/java/lingo/common/ChatMessage.java rename to common/src/main/java/com/charego/lingo/common/ChatMessage.java index a8525c5..eefc4d9 100644 --- a/common/src/main/java/lingo/common/ChatMessage.java +++ b/common/src/main/java/com/charego/lingo/common/ChatMessage.java @@ -1,4 +1,4 @@ -package lingo.common; +package com.charego.lingo.common; public class ChatMessage { diff --git a/common/src/main/java/lingo/common/Game.java b/common/src/main/java/com/charego/lingo/common/Game.java similarity index 98% rename from common/src/main/java/lingo/common/Game.java rename to common/src/main/java/com/charego/lingo/common/Game.java index 0339408..02d1c92 100644 --- a/common/src/main/java/lingo/common/Game.java +++ b/common/src/main/java/com/charego/lingo/common/Game.java @@ -1,4 +1,4 @@ -package lingo.common; +package com.charego.lingo.common; import java.util.Arrays; import java.util.Collections; diff --git a/common/src/main/java/lingo/common/GameLeftMessage.java b/common/src/main/java/com/charego/lingo/common/GameLeftMessage.java similarity index 93% rename from common/src/main/java/lingo/common/GameLeftMessage.java rename to common/src/main/java/com/charego/lingo/common/GameLeftMessage.java index b15296f..f99266a 100644 --- a/common/src/main/java/lingo/common/GameLeftMessage.java +++ b/common/src/main/java/com/charego/lingo/common/GameLeftMessage.java @@ -1,4 +1,4 @@ -package lingo.common; +package com.charego.lingo.common; public class GameLeftMessage { diff --git a/common/src/main/java/lingo/common/Player.java b/common/src/main/java/com/charego/lingo/common/Player.java similarity index 94% rename from common/src/main/java/lingo/common/Player.java rename to common/src/main/java/com/charego/lingo/common/Player.java index 79a3fb2..db18916 100644 --- a/common/src/main/java/lingo/common/Player.java +++ b/common/src/main/java/com/charego/lingo/common/Player.java @@ -1,4 +1,4 @@ -package lingo.common; +package com.charego.lingo.common; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/common/src/main/java/lingo/common/Report.java b/common/src/main/java/com/charego/lingo/common/Report.java similarity index 94% rename from common/src/main/java/lingo/common/Report.java rename to common/src/main/java/com/charego/lingo/common/Report.java index c1e5d98..58f0aff 100644 --- a/common/src/main/java/lingo/common/Report.java +++ b/common/src/main/java/com/charego/lingo/common/Report.java @@ -1,4 +1,4 @@ -package lingo.common; +package com.charego.lingo.common; public class Report { diff --git a/common/src/main/java/lingo/common/SetUsernameMessage.java b/common/src/main/java/com/charego/lingo/common/SetUsernameMessage.java similarity index 95% rename from common/src/main/java/lingo/common/SetUsernameMessage.java rename to common/src/main/java/com/charego/lingo/common/SetUsernameMessage.java index 73515a1..3c652a4 100644 --- a/common/src/main/java/lingo/common/SetUsernameMessage.java +++ b/common/src/main/java/com/charego/lingo/common/SetUsernameMessage.java @@ -1,4 +1,4 @@ -package lingo.common; +package com.charego.lingo.common; public class SetUsernameMessage { diff --git a/common/src/main/java/lingo/common/WordReader.java b/common/src/main/java/com/charego/lingo/common/WordReader.java similarity index 96% rename from common/src/main/java/lingo/common/WordReader.java rename to common/src/main/java/com/charego/lingo/common/WordReader.java index 0868357..dbea666 100644 --- a/common/src/main/java/lingo/common/WordReader.java +++ b/common/src/main/java/com/charego/lingo/common/WordReader.java @@ -1,4 +1,4 @@ -package lingo.common; +package com.charego.lingo.common; import java.io.BufferedReader; import java.io.IOException; diff --git a/pom.xml b/pom.xml index dc123d7..1ae56d4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ - client-api + api common server diff --git a/server/pom.xml b/server/pom.xml index 3102f82..fa7c4cb 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} ${project.version} - lingo-client-api + lingo-api @@ -56,7 +56,7 @@ ${project.artifactId} - lingo.server.LingoServer + com.charego.lingo.server.LingoServer diff --git a/server/src/main/java/lingo/server/LingoController.java b/server/src/main/java/com/charego/lingo/server/LingoController.java similarity index 96% rename from server/src/main/java/lingo/server/LingoController.java rename to server/src/main/java/com/charego/lingo/server/LingoController.java index 105287e..5ccfd96 100644 --- a/server/src/main/java/lingo/server/LingoController.java +++ b/server/src/main/java/com/charego/lingo/server/LingoController.java @@ -1,4 +1,4 @@ -package lingo.server; +package com.charego.lingo.server; import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER; @@ -24,13 +24,13 @@ import org.springframework.messaging.simp.annotation.SubscribeMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import lingo.client.api.Destinations; -import lingo.common.ChatMessage; -import lingo.common.Game; -import lingo.common.GameLeftMessage; -import lingo.common.Player; -import lingo.common.Report; -import lingo.common.SetUsernameMessage; +import com.charego.lingo.api.Destinations; +import com.charego.lingo.common.ChatMessage; +import com.charego.lingo.common.Game; +import com.charego.lingo.common.GameLeftMessage; +import com.charego.lingo.common.Player; +import com.charego.lingo.common.Report; +import com.charego.lingo.common.SetUsernameMessage; @RestController public class LingoController { diff --git a/server/src/main/java/lingo/server/LingoServer.java b/server/src/main/java/com/charego/lingo/server/LingoServer.java similarity index 93% rename from server/src/main/java/lingo/server/LingoServer.java rename to server/src/main/java/com/charego/lingo/server/LingoServer.java index 0dd8f77..5a4a01e 100644 --- a/server/src/main/java/lingo/server/LingoServer.java +++ b/server/src/main/java/com/charego/lingo/server/LingoServer.java @@ -1,4 +1,4 @@ -package lingo.server; +package com.charego.lingo.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/server/src/main/java/lingo/server/PracticeController.java b/server/src/main/java/com/charego/lingo/server/PracticeController.java similarity index 94% rename from server/src/main/java/lingo/server/PracticeController.java rename to server/src/main/java/com/charego/lingo/server/PracticeController.java index ba1856b..d57a547 100644 --- a/server/src/main/java/lingo/server/PracticeController.java +++ b/server/src/main/java/com/charego/lingo/server/PracticeController.java @@ -1,4 +1,4 @@ -package lingo.server; +package com.charego.lingo.server; import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER; @@ -16,10 +16,10 @@ import org.springframework.messaging.simp.SimpMessageType; import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.web.bind.annotation.RestController; -import lingo.client.api.Destinations; -import lingo.common.Game; -import lingo.common.Player; -import lingo.common.Report; +import com.charego.lingo.api.Destinations; +import com.charego.lingo.common.Game; +import com.charego.lingo.common.Player; +import com.charego.lingo.common.Report; @RestController public class PracticeController { diff --git a/server/src/main/java/lingo/server/SessionManager.java b/server/src/main/java/com/charego/lingo/server/SessionManager.java similarity index 96% rename from server/src/main/java/lingo/server/SessionManager.java rename to server/src/main/java/com/charego/lingo/server/SessionManager.java index de0bc83..bbe01a7 100644 --- a/server/src/main/java/lingo/server/SessionManager.java +++ b/server/src/main/java/com/charego/lingo/server/SessionManager.java @@ -1,4 +1,4 @@ -package lingo.server; +package com.charego.lingo.server; import java.util.HashMap; import java.util.HashSet; @@ -14,7 +14,7 @@ import org.springframework.web.socket.messaging.AbstractSubProtocolEvent; import org.springframework.web.socket.messaging.SessionConnectedEvent; import org.springframework.web.socket.messaging.SessionDisconnectEvent; -import lingo.common.Player; +import com.charego.lingo.common.Player; @Component public class SessionManager implements ApplicationListener { diff --git a/server/src/main/java/lingo/server/WebSocketConfig.java b/server/src/main/java/com/charego/lingo/server/WebSocketConfig.java similarity index 98% rename from server/src/main/java/lingo/server/WebSocketConfig.java rename to server/src/main/java/com/charego/lingo/server/WebSocketConfig.java index e259069..54b2215 100644 --- a/server/src/main/java/lingo/server/WebSocketConfig.java +++ b/server/src/main/java/com/charego/lingo/server/WebSocketConfig.java @@ -1,4 +1,4 @@ -package lingo.server; +package com.charego.lingo.server; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.ChannelRegistration; diff --git a/server/src/main/java/lingo/server/WordRepository.java b/server/src/main/java/com/charego/lingo/server/WordRepository.java similarity index 90% rename from server/src/main/java/lingo/server/WordRepository.java rename to server/src/main/java/com/charego/lingo/server/WordRepository.java index abb2395..0926812 100644 --- a/server/src/main/java/lingo/server/WordRepository.java +++ b/server/src/main/java/com/charego/lingo/server/WordRepository.java @@ -1,4 +1,4 @@ -package lingo.server; +package com.charego.lingo.server; import java.io.IOException; import java.util.ArrayList; @@ -8,7 +8,7 @@ import java.util.Set; import org.springframework.stereotype.Component; -import lingo.common.WordReader; +import com.charego.lingo.common.WordReader; @Component public class WordRepository {