refactor: renamed package names to be lowercase

This commit is contained in:
Yannik Bretschneider 2021-05-26 18:52:34 +02:00
parent 741f907348
commit ae64d51a73
13 changed files with 25 additions and 28 deletions

10
.idea/modules.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Server.iml" filepath="$PROJECT_DIR$/Server.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/Server.main.iml" filepath="$PROJECT_DIR$/.idea/modules/Server.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/Server.test.iml" filepath="$PROJECT_DIR$/.idea/modules/Server.test.iml" />
</modules>
</component>
</project>

View File

@ -3,5 +3,6 @@
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" /> <mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/Gamelib" vcs="Git" /> <mapping directory="$PROJECT_DIR$/Gamelib" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component> </component>
</project> </project>

View File

@ -1,20 +1,17 @@
package uulm.teamname.marvelous.server.Lobby; package uulm.teamname.marvelous.server.lobby;
import uulm.teamname.marvelous.gamelibrary.IntVector2; import uulm.teamname.marvelous.gamelibrary.IntVector2;
import uulm.teamname.marvelous.gamelibrary.entities.Entity;
import uulm.teamname.marvelous.gamelibrary.entities.Character; import uulm.teamname.marvelous.gamelibrary.entities.Character;
import uulm.teamname.marvelous.gamelibrary.entities.EntityID; import uulm.teamname.marvelous.gamelibrary.entities.EntityID;
import uulm.teamname.marvelous.gamelibrary.entities.EntityType;
import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.events.EventBuilder; import uulm.teamname.marvelous.gamelibrary.events.EventBuilder;
import uulm.teamname.marvelous.gamelibrary.events.EventType; import uulm.teamname.marvelous.gamelibrary.events.EventType;
import uulm.teamname.marvelous.gamelibrary.gamelogic.EventObserver; import uulm.teamname.marvelous.gamelibrary.gamelogic.EventObserver;
import uulm.teamname.marvelous.gamelibrary.gamelogic.GameInstance; import uulm.teamname.marvelous.gamelibrary.gamelogic.GameInstance;
import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType;
import uulm.teamname.marvelous.gamelibrary.requests.Request; import uulm.teamname.marvelous.gamelibrary.requests.Request;
import uulm.teamname.marvelous.gamelibrary.requests.RequestType; import uulm.teamname.marvelous.gamelibrary.requests.RequestType;
import uulm.teamname.marvelous.server.LobbyManager.LobbyConnection; import uulm.teamname.marvelous.server.lobbymanager.LobbyConnection;
import uulm.teamname.marvelous.server.LobbyManager.Participant; import uulm.teamname.marvelous.server.lobbymanager.Participant;
import java.util.*; import java.util.*;

View File

@ -1,4 +1,4 @@
package uulm.teamname.marvelous.server.Lobby; package uulm.teamname.marvelous.server.lobby;
public class PauseHandler { public class PauseHandler {
private boolean paused; private boolean paused;

View File

@ -1,6 +1,5 @@
package uulm.teamname.marvelous.server.Lobby.pipelining; package uulm.teamname.marvelous.server.lobby.pipelining;
import uulm.teamname.marvelous.gamelibrary.Tuple;
import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.events.EventBuilder; import uulm.teamname.marvelous.gamelibrary.events.EventBuilder;
import uulm.teamname.marvelous.gamelibrary.events.EventType; import uulm.teamname.marvelous.gamelibrary.events.EventType;

View File

@ -1,6 +1,5 @@
package uulm.teamname.marvelous.server.Lobby.pipelining; package uulm.teamname.marvelous.server.lobby.pipelining;
import uulm.teamname.marvelous.gamelibrary.Tuple;
import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.requests.Request; import uulm.teamname.marvelous.gamelibrary.requests.Request;

View File

@ -1,6 +1,5 @@
package uulm.teamname.marvelous.server.Lobby.pipelining; package uulm.teamname.marvelous.server.lobby.pipelining;
import uulm.teamname.marvelous.gamelibrary.Tuple;
import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.requests.Request; import uulm.teamname.marvelous.gamelibrary.requests.Request;

View File

@ -1,9 +1,7 @@
package uulm.teamname.marvelous.server.LobbyManager; package uulm.teamname.marvelous.server.lobbymanager;
import org.java_websocket.WebSocket;
import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType; import uulm.teamname.marvelous.server.lobby.Lobby;
import uulm.teamname.marvelous.server.Lobby.Lobby;
import java.util.HashSet; import java.util.HashSet;

View File

@ -1,9 +1,7 @@
package uulm.teamname.marvelous.server.LobbyManager; package uulm.teamname.marvelous.server.lobbymanager;
import org.java_websocket.WebSocket; import org.java_websocket.WebSocket;
import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType;
import uulm.teamname.marvelous.server.Lobby.Lobby;
import java.util.HashMap; import java.util.HashMap;

View File

@ -1,4 +1,4 @@
package uulm.teamname.marvelous.server.LobbyManager; package uulm.teamname.marvelous.server.lobbymanager;
import org.java_websocket.WebSocket; import org.java_websocket.WebSocket;
import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType; import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType;

View File

@ -1,4 +1,4 @@
package uulm.teamname.marvelous.server.NetConnector; package uulm.teamname.marvelous.server.netconnector;
import org.java_websocket.WebSocket; import org.java_websocket.WebSocket;
import org.java_websocket.handshake.ClientHandshake; import org.java_websocket.handshake.ClientHandshake;

View File

@ -1,12 +1,9 @@
package uulm.teamname.marvelous.server.Lobby.pipelining; package uulm.teamname.marvelous.server.lobby.pipelining;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.*; import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.*;
class PauseSegmentTest { class PauseSegmentTest {
PauseSegment pauseSegment; PauseSegment pauseSegment;

View File

@ -1,10 +1,9 @@
package uulm.teamname.marvelous.server.NetConnector; package uulm.teamname.marvelous.server.netconnector;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.*;
class MarvelousServerTest { class MarvelousServerTest {