diff --git a/src/edu/kit/informatik/Main.java b/src/edu/kit/informatik/modelrailwaysimulator/Main.java similarity index 76% rename from src/edu/kit/informatik/Main.java rename to src/edu/kit/informatik/modelrailwaysimulator/Main.java index 3b41b40..8075dda 100644 --- a/src/edu/kit/informatik/Main.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/Main.java @@ -1,6 +1,6 @@ -package edu.kit.informatik; +package edu.kit.informatik.modelrailwaysimulator; -import edu.kit.informatik.ui.CommandLine; +import edu.kit.informatik.modelrailwaysimulator.ui.CommandLine; /** * The main class. diff --git a/src/edu/kit/informatik/MainTest.java b/src/edu/kit/informatik/modelrailwaysimulator/MainTest.java similarity index 97% rename from src/edu/kit/informatik/MainTest.java rename to src/edu/kit/informatik/modelrailwaysimulator/MainTest.java index 8f003a5..0b2fe85 100644 --- a/src/edu/kit/informatik/MainTest.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/MainTest.java @@ -1,5 +1,6 @@ -package edu.kit.informatik; +package edu.kit.informatik.modelrailwaysimulator; +import edu.kit.informatik.Terminal; import org.junit.jupiter.api.Test; import java.io.*; diff --git a/src/edu/kit/informatik/model/Coach.java b/src/edu/kit/informatik/modelrailwaysimulator/model/Coach.java similarity index 90% rename from src/edu/kit/informatik/model/Coach.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/Coach.java index 7618a76..fa89373 100644 --- a/src/edu/kit/informatik/model/Coach.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/Coach.java @@ -1,10 +1,10 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; /** * A coach. diff --git a/src/edu/kit/informatik/model/DieselEngine.java b/src/edu/kit/informatik/modelrailwaysimulator/model/DieselEngine.java similarity index 91% rename from src/edu/kit/informatik/model/DieselEngine.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/DieselEngine.java index 8e8cf9a..a154951 100644 --- a/src/edu/kit/informatik/model/DieselEngine.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/DieselEngine.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * Diesel engine. diff --git a/src/edu/kit/informatik/model/ElectricalEngine.java b/src/edu/kit/informatik/modelrailwaysimulator/model/ElectricalEngine.java similarity index 92% rename from src/edu/kit/informatik/model/ElectricalEngine.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/ElectricalEngine.java index 88fbcd9..b672096 100644 --- a/src/edu/kit/informatik/model/ElectricalEngine.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/ElectricalEngine.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * Electrical engine. diff --git a/src/edu/kit/informatik/model/Engine.java b/src/edu/kit/informatik/modelrailwaysimulator/model/Engine.java similarity index 94% rename from src/edu/kit/informatik/model/Engine.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/Engine.java index 4fd1b5e..deef325 100644 --- a/src/edu/kit/informatik/model/Engine.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/Engine.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * Generic engine, is usually either diesel, steam or electric. diff --git a/src/edu/kit/informatik/model/FreightCoach.java b/src/edu/kit/informatik/modelrailwaysimulator/model/FreightCoach.java similarity index 90% rename from src/edu/kit/informatik/model/FreightCoach.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/FreightCoach.java index 07475c1..1288e43 100644 --- a/src/edu/kit/informatik/model/FreightCoach.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/FreightCoach.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * A freight coach. diff --git a/src/edu/kit/informatik/model/ModelRailwaySimulation.java b/src/edu/kit/informatik/modelrailwaysimulator/model/ModelRailwaySimulation.java similarity index 98% rename from src/edu/kit/informatik/model/ModelRailwaySimulation.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/ModelRailwaySimulation.java index 05fea1c..b5c9b61 100644 --- a/src/edu/kit/informatik/model/ModelRailwaySimulation.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/ModelRailwaySimulation.java @@ -1,7 +1,7 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.CoachType; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.CoachType; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/edu/kit/informatik/model/PassengerCoach.java b/src/edu/kit/informatik/modelrailwaysimulator/model/PassengerCoach.java similarity index 91% rename from src/edu/kit/informatik/model/PassengerCoach.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/PassengerCoach.java index 408f53f..c64aceb 100644 --- a/src/edu/kit/informatik/model/PassengerCoach.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/PassengerCoach.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * A passenger coach. diff --git a/src/edu/kit/informatik/model/Rail.java b/src/edu/kit/informatik/modelrailwaysimulator/model/Rail.java similarity index 98% rename from src/edu/kit/informatik/model/Rail.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/Rail.java index 6a70bfd..7211af6 100644 --- a/src/edu/kit/informatik/model/Rail.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/Rail.java @@ -1,4 +1,4 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; /** * Generic rail that other rails can connect to. diff --git a/src/edu/kit/informatik/model/RailwayNetwork.java b/src/edu/kit/informatik/modelrailwaysimulator/model/RailwayNetwork.java similarity index 98% rename from src/edu/kit/informatik/model/RailwayNetwork.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/RailwayNetwork.java index 1df3fa6..61fbb5e 100644 --- a/src/edu/kit/informatik/model/RailwayNetwork.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/RailwayNetwork.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.HashMap; import java.util.HashSet; diff --git a/src/edu/kit/informatik/model/RollingStock.java b/src/edu/kit/informatik/modelrailwaysimulator/model/RollingStock.java similarity index 95% rename from src/edu/kit/informatik/model/RollingStock.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/RollingStock.java index 9c908fc..ae70de4 100644 --- a/src/edu/kit/informatik/model/RollingStock.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/RollingStock.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * A rolling stock with a specific integer length and couplings. Is usually an engine, train set or coach. diff --git a/src/edu/kit/informatik/model/SpecialCoach.java b/src/edu/kit/informatik/modelrailwaysimulator/model/SpecialCoach.java similarity index 91% rename from src/edu/kit/informatik/model/SpecialCoach.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/SpecialCoach.java index 69cf62d..615e4cd 100644 --- a/src/edu/kit/informatik/model/SpecialCoach.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/SpecialCoach.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * A special coach, used for e.g. firefighting. diff --git a/src/edu/kit/informatik/model/SteamEngine.java b/src/edu/kit/informatik/modelrailwaysimulator/model/SteamEngine.java similarity index 91% rename from src/edu/kit/informatik/model/SteamEngine.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/SteamEngine.java index cc780c6..634758d 100644 --- a/src/edu/kit/informatik/model/SteamEngine.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/SteamEngine.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * Steam engine. diff --git a/src/edu/kit/informatik/model/Switch.java b/src/edu/kit/informatik/modelrailwaysimulator/model/Switch.java similarity index 97% rename from src/edu/kit/informatik/model/Switch.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/Switch.java index 199cfed..828fbd9 100644 --- a/src/edu/kit/informatik/model/Switch.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/Switch.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.Objects; diff --git a/src/edu/kit/informatik/model/Track.java b/src/edu/kit/informatik/modelrailwaysimulator/model/Track.java similarity index 97% rename from src/edu/kit/informatik/model/Track.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/Track.java index 484181f..aaf5ff9 100644 --- a/src/edu/kit/informatik/model/Track.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/Track.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.Objects; diff --git a/src/edu/kit/informatik/model/Train.java b/src/edu/kit/informatik/modelrailwaysimulator/model/Train.java similarity index 99% rename from src/edu/kit/informatik/model/Train.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/Train.java index 1b52ef3..9a35d6b 100644 --- a/src/edu/kit/informatik/model/Train.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/Train.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/edu/kit/informatik/model/TrainManager.java b/src/edu/kit/informatik/modelrailwaysimulator/model/TrainManager.java similarity index 99% rename from src/edu/kit/informatik/model/TrainManager.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/TrainManager.java index 516cbf8..5a368fa 100644 --- a/src/edu/kit/informatik/model/TrainManager.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/TrainManager.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.ArrayList; import java.util.Collections; diff --git a/src/edu/kit/informatik/model/TrainSet.java b/src/edu/kit/informatik/modelrailwaysimulator/model/TrainSet.java similarity index 94% rename from src/edu/kit/informatik/model/TrainSet.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/TrainSet.java index 9ea03de..305afa0 100644 --- a/src/edu/kit/informatik/model/TrainSet.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/TrainSet.java @@ -1,6 +1,6 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * Train set. diff --git a/src/edu/kit/informatik/model/Vector2D.java b/src/edu/kit/informatik/modelrailwaysimulator/model/Vector2D.java similarity index 98% rename from src/edu/kit/informatik/model/Vector2D.java rename to src/edu/kit/informatik/modelrailwaysimulator/model/Vector2D.java index 37ead53..1d7dcc5 100644 --- a/src/edu/kit/informatik/model/Vector2D.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/model/Vector2D.java @@ -1,4 +1,4 @@ -package edu.kit.informatik.model; +package edu.kit.informatik.modelrailwaysimulator.model; import java.util.Objects; diff --git a/src/edu/kit/informatik/ui/CoachType.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/CoachType.java similarity index 85% rename from src/edu/kit/informatik/ui/CoachType.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/CoachType.java index f2184ae..ca4bcd6 100644 --- a/src/edu/kit/informatik/ui/CoachType.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/CoachType.java @@ -1,9 +1,9 @@ -package edu.kit.informatik.ui; +package edu.kit.informatik.modelrailwaysimulator.ui; -import edu.kit.informatik.model.Coach; -import edu.kit.informatik.model.FreightCoach; -import edu.kit.informatik.model.PassengerCoach; -import edu.kit.informatik.model.SpecialCoach; +import edu.kit.informatik.modelrailwaysimulator.model.Coach; +import edu.kit.informatik.modelrailwaysimulator.model.FreightCoach; +import edu.kit.informatik.modelrailwaysimulator.model.PassengerCoach; +import edu.kit.informatik.modelrailwaysimulator.model.SpecialCoach; /** * Type of a coach. diff --git a/src/edu/kit/informatik/ui/CommandLine.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/CommandLine.java similarity index 87% rename from src/edu/kit/informatik/ui/CommandLine.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/CommandLine.java index 67ee8c7..0645257 100644 --- a/src/edu/kit/informatik/ui/CommandLine.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/CommandLine.java @@ -1,8 +1,8 @@ -package edu.kit.informatik.ui; +package edu.kit.informatik.modelrailwaysimulator.ui; -import edu.kit.informatik.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.command.CommandFactory; +import edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory; /** * Interactive simulation runner: gets user inputs and processes specified commands. diff --git a/src/edu/kit/informatik/ui/EngineType.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/EngineType.java similarity index 86% rename from src/edu/kit/informatik/ui/EngineType.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/EngineType.java index 4a103b2..b6027dc 100644 --- a/src/edu/kit/informatik/ui/EngineType.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/EngineType.java @@ -1,9 +1,9 @@ -package edu.kit.informatik.ui; +package edu.kit.informatik.modelrailwaysimulator.ui; -import edu.kit.informatik.model.DieselEngine; -import edu.kit.informatik.model.ElectricalEngine; -import edu.kit.informatik.model.Engine; -import edu.kit.informatik.model.SteamEngine; +import edu.kit.informatik.modelrailwaysimulator.model.DieselEngine; +import edu.kit.informatik.modelrailwaysimulator.model.ElectricalEngine; +import edu.kit.informatik.modelrailwaysimulator.model.Engine; +import edu.kit.informatik.modelrailwaysimulator.model.SteamEngine; /** * Type of locomotive. Can be either diesel, steam or electrical. diff --git a/src/edu/kit/informatik/ui/InvalidInputException.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/InvalidInputException.java similarity index 87% rename from src/edu/kit/informatik/ui/InvalidInputException.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/InvalidInputException.java index 13d1e20..6a5da31 100644 --- a/src/edu/kit/informatik/ui/InvalidInputException.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/InvalidInputException.java @@ -1,4 +1,4 @@ -package edu.kit.informatik.ui; +package edu.kit.informatik.modelrailwaysimulator.ui; /** * Thrown on invalid user input. diff --git a/src/edu/kit/informatik/ui/command/AddSwitch.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddSwitch.java similarity index 78% rename from src/edu/kit/informatik/ui/command/AddSwitch.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddSwitch.java index b286477..41ddb5b 100644 --- a/src/edu/kit/informatik/ui/command/AddSwitch.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddSwitch.java @@ -1,15 +1,15 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.model.Vector2D; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.Vector2D; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.command.CommandFactory.ADD_SWITCH; -import static edu.kit.informatik.ui.command.CommandFactory.VECTOR; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.ADD_SWITCH; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.VECTOR; /** * Command used to add a switch to the rail network. diff --git a/src/edu/kit/informatik/ui/command/AddTrack.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrack.java similarity index 76% rename from src/edu/kit/informatik/ui/command/AddTrack.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrack.java index 59d9e85..0e5850f 100644 --- a/src/edu/kit/informatik/ui/command/AddTrack.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrack.java @@ -1,15 +1,15 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.model.Vector2D; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.Vector2D; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.command.CommandFactory.ADD_TRACK; -import static edu.kit.informatik.ui.command.CommandFactory.VECTOR; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.ADD_TRACK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.VECTOR; /** * Command used to add a track to the rail network. diff --git a/src/edu/kit/informatik/ui/command/AddTrain.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrain.java similarity index 73% rename from src/edu/kit/informatik/ui/command/AddTrain.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrain.java index 1ad6606..7fbdb6b 100644 --- a/src/edu/kit/informatik/ui/command/AddTrain.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrain.java @@ -1,16 +1,16 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.model.RollingStock; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.RollingStock; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.command.CommandFactory.ADD_TRAIN; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; -import static edu.kit.informatik.ui.command.CommandFactory.ROLLING_STOCK_IDENTIFIER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.ADD_TRAIN; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.ROLLING_STOCK_IDENTIFIER; /** * Command used to construct a new train or modify an existing train. diff --git a/src/edu/kit/informatik/ui/command/Command.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/Command.java similarity index 78% rename from src/edu/kit/informatik/ui/command/Command.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/Command.java index 44c8389..126d26a 100644 --- a/src/edu/kit/informatik/ui/command/Command.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/Command.java @@ -1,7 +1,7 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; /** * Command that can be applied to a simulation. diff --git a/src/edu/kit/informatik/ui/command/CommandFactory.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CommandFactory.java similarity index 96% rename from src/edu/kit/informatik/ui/command/CommandFactory.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/CommandFactory.java index 071bc3e..4025a72 100644 --- a/src/edu/kit/informatik/ui/command/CommandFactory.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CommandFactory.java @@ -1,7 +1,7 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.Coach; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.Coach; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.HashMap; import java.util.Map; diff --git a/src/edu/kit/informatik/ui/command/CreateCoach.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateCoach.java similarity index 75% rename from src/edu/kit/informatik/ui/command/CreateCoach.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateCoach.java index 837a41c..1e9f9ea 100644 --- a/src/edu/kit/informatik/ui/command/CreateCoach.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateCoach.java @@ -1,17 +1,17 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.ui.CoachType; -import edu.kit.informatik.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.CoachType; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.CoachType.COACH_TYPE; -import static edu.kit.informatik.ui.command.CommandFactory.BOOL; -import static edu.kit.informatik.ui.command.CommandFactory.CREATE_COACH; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.CoachType.COACH_TYPE; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.BOOL; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.CREATE_COACH; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; /** * Command used to create a single coach. diff --git a/src/edu/kit/informatik/ui/command/CreateEngine.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateEngine.java similarity index 73% rename from src/edu/kit/informatik/ui/command/CreateEngine.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateEngine.java index 86854b8..77115e5 100644 --- a/src/edu/kit/informatik/ui/command/CreateEngine.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateEngine.java @@ -1,20 +1,20 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.Coach; -import edu.kit.informatik.model.Engine; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.EngineType; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.Coach; +import edu.kit.informatik.modelrailwaysimulator.model.Engine; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.EngineType; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.EngineType.ENGINE_TYPE; -import static edu.kit.informatik.ui.command.CommandFactory.ALPHANUMERIC_WORD; -import static edu.kit.informatik.ui.command.CommandFactory.BOOL; -import static edu.kit.informatik.ui.command.CommandFactory.CREATE_ENGINE; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.EngineType.ENGINE_TYPE; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.ALPHANUMERIC_WORD; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.BOOL; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.CREATE_ENGINE; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; /** * Command used to create a single engine. diff --git a/src/edu/kit/informatik/ui/command/CreateTrainSet.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateTrainSet.java similarity index 75% rename from src/edu/kit/informatik/ui/command/CreateTrainSet.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateTrainSet.java index 084114b..45df447 100644 --- a/src/edu/kit/informatik/ui/command/CreateTrainSet.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateTrainSet.java @@ -1,18 +1,18 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.Coach; -import edu.kit.informatik.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.Coach; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.TrainSet; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.TrainSet; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.command.CommandFactory.ALPHANUMERIC_WORD; -import static edu.kit.informatik.ui.command.CommandFactory.BOOL; -import static edu.kit.informatik.ui.command.CommandFactory.CREATE_TRAIN_SET; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.ALPHANUMERIC_WORD; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.BOOL; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.CREATE_TRAIN_SET; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; /** * Command used to add a new train set. diff --git a/src/edu/kit/informatik/ui/command/DeleteRollingStock.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteRollingStock.java similarity index 72% rename from src/edu/kit/informatik/ui/command/DeleteRollingStock.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteRollingStock.java index 24d4ba1..bd9e7fc 100644 --- a/src/edu/kit/informatik/ui/command/DeleteRollingStock.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteRollingStock.java @@ -1,15 +1,15 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.CommandLine.OK; -import static edu.kit.informatik.ui.command.CommandFactory.DELETE_ROLLING_STOCK; -import static edu.kit.informatik.ui.command.CommandFactory.ROLLING_STOCK_IDENTIFIER; +import static edu.kit.informatik.modelrailwaysimulator.ui.CommandLine.OK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.DELETE_ROLLING_STOCK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.ROLLING_STOCK_IDENTIFIER; /** * Command used to delete rolling stock. diff --git a/src/edu/kit/informatik/ui/command/DeleteTrack.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrack.java similarity index 68% rename from src/edu/kit/informatik/ui/command/DeleteTrack.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrack.java index bc695c6..5fa2277 100644 --- a/src/edu/kit/informatik/ui/command/DeleteTrack.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrack.java @@ -1,12 +1,12 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; -import static edu.kit.informatik.ui.CommandLine.OK; -import static edu.kit.informatik.ui.command.CommandFactory.DELETE_TRACK; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.CommandLine.OK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.DELETE_TRACK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; /** * Command used to delete a track or switch. diff --git a/src/edu/kit/informatik/ui/command/DeleteTrain.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrain.java similarity index 68% rename from src/edu/kit/informatik/ui/command/DeleteTrain.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrain.java index 325cf87..345a641 100644 --- a/src/edu/kit/informatik/ui/command/DeleteTrain.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrain.java @@ -1,12 +1,12 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; -import static edu.kit.informatik.ui.CommandLine.OK; -import static edu.kit.informatik.ui.command.CommandFactory.DELETE_TRAIN; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.CommandLine.OK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.DELETE_TRAIN; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; /** * Command used to delete a train, without deleting rolling stock of the train. diff --git a/src/edu/kit/informatik/ui/command/ListCoaches.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListCoaches.java similarity index 73% rename from src/edu/kit/informatik/ui/command/ListCoaches.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListCoaches.java index ea81d70..3eff6c1 100644 --- a/src/edu/kit/informatik/ui/command/ListCoaches.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListCoaches.java @@ -1,12 +1,12 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.List; -import static edu.kit.informatik.ui.command.CommandFactory.LIST_COACHES; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.LIST_COACHES; /** * Command used to print a list of coaches. diff --git a/src/edu/kit/informatik/ui/command/ListEngines.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListEngines.java similarity index 73% rename from src/edu/kit/informatik/ui/command/ListEngines.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListEngines.java index 6ed34a8..479a50d 100644 --- a/src/edu/kit/informatik/ui/command/ListEngines.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListEngines.java @@ -1,12 +1,12 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.List; -import static edu.kit.informatik.ui.command.CommandFactory.LIST_ENGINES; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.LIST_ENGINES; /** * Command used to print a list of engines. diff --git a/src/edu/kit/informatik/ui/command/ListTracks.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTracks.java similarity index 74% rename from src/edu/kit/informatik/ui/command/ListTracks.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTracks.java index b9abfb6..b7565b9 100644 --- a/src/edu/kit/informatik/ui/command/ListTracks.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTracks.java @@ -1,12 +1,12 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.List; -import static edu.kit.informatik.ui.command.CommandFactory.LIST_TRACKS; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.LIST_TRACKS; /** * Command used to print a list of tracks and switches. diff --git a/src/edu/kit/informatik/ui/command/ListTrainSets.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrainSets.java similarity index 74% rename from src/edu/kit/informatik/ui/command/ListTrainSets.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrainSets.java index ceaeaa9..8891d77 100644 --- a/src/edu/kit/informatik/ui/command/ListTrainSets.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrainSets.java @@ -1,12 +1,12 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.List; -import static edu.kit.informatik.ui.command.CommandFactory.LIST_TRAIN_SETS; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.LIST_TRAIN_SETS; /** * Command used to print a list of train sets on the terminal. diff --git a/src/edu/kit/informatik/ui/command/ListTrains.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrains.java similarity index 74% rename from src/edu/kit/informatik/ui/command/ListTrains.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrains.java index 5309078..e038cea 100644 --- a/src/edu/kit/informatik/ui/command/ListTrains.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrains.java @@ -1,12 +1,12 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.SortedMap; -import static edu.kit.informatik.ui.command.CommandFactory.LIST_TRAINS; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.LIST_TRAINS; /** * Command used to print a list of trains on the terminal. diff --git a/src/edu/kit/informatik/ui/command/PutTrain.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/PutTrain.java similarity index 72% rename from src/edu/kit/informatik/ui/command/PutTrain.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/PutTrain.java index 3a5c576..351a227 100644 --- a/src/edu/kit/informatik/ui/command/PutTrain.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/PutTrain.java @@ -1,17 +1,17 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.model.Vector2D; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.Vector2D; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.CommandLine.OK; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; -import static edu.kit.informatik.ui.command.CommandFactory.PUT_TRAIN; -import static edu.kit.informatik.ui.command.CommandFactory.VECTOR; +import static edu.kit.informatik.modelrailwaysimulator.ui.CommandLine.OK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.PUT_TRAIN; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.VECTOR; /** * Command used to put a train on the rail network. diff --git a/src/edu/kit/informatik/ui/command/SetSwitch.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/SetSwitch.java similarity index 70% rename from src/edu/kit/informatik/ui/command/SetSwitch.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/SetSwitch.java index 22fed32..36911ea 100644 --- a/src/edu/kit/informatik/ui/command/SetSwitch.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/SetSwitch.java @@ -1,17 +1,17 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.model.Vector2D; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.Vector2D; import edu.kit.informatik.Terminal; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static edu.kit.informatik.ui.CommandLine.OK; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; -import static edu.kit.informatik.ui.command.CommandFactory.SET_SWITCH; -import static edu.kit.informatik.ui.command.CommandFactory.VECTOR; +import static edu.kit.informatik.modelrailwaysimulator.ui.CommandLine.OK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.SET_SWITCH; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.VECTOR; /** * Command used to specify the position a switch is set to. diff --git a/src/edu/kit/informatik/ui/command/ShowTrain.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ShowTrain.java similarity index 69% rename from src/edu/kit/informatik/ui/command/ShowTrain.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/ShowTrain.java index c367aa4..e7ff758 100644 --- a/src/edu/kit/informatik/ui/command/ShowTrain.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/ShowTrain.java @@ -1,11 +1,11 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; -import static edu.kit.informatik.ui.command.CommandFactory.SHOW_TRAIN; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.SHOW_TRAIN; /** * Command used to print a train as ASCII art. diff --git a/src/edu/kit/informatik/ui/command/Step.java b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/Step.java similarity index 78% rename from src/edu/kit/informatik/ui/command/Step.java rename to src/edu/kit/informatik/modelrailwaysimulator/ui/command/Step.java index bfd5aef..b4c8693 100644 --- a/src/edu/kit/informatik/ui/command/Step.java +++ b/src/edu/kit/informatik/modelrailwaysimulator/ui/command/Step.java @@ -1,17 +1,17 @@ -package edu.kit.informatik.ui.command; +package edu.kit.informatik.modelrailwaysimulator.ui.command; import edu.kit.informatik.Terminal; -import edu.kit.informatik.model.ModelRailwaySimulation; -import edu.kit.informatik.model.Vector2D; -import edu.kit.informatik.ui.InvalidInputException; +import edu.kit.informatik.modelrailwaysimulator.model.ModelRailwaySimulation; +import edu.kit.informatik.modelrailwaysimulator.model.Vector2D; +import edu.kit.informatik.modelrailwaysimulator.ui.InvalidInputException; import java.util.List; import java.util.Optional; import java.util.SortedSet; -import static edu.kit.informatik.ui.CommandLine.OK; -import static edu.kit.informatik.ui.command.CommandFactory.NUMBER; -import static edu.kit.informatik.ui.command.CommandFactory.STEP; +import static edu.kit.informatik.modelrailwaysimulator.ui.CommandLine.OK; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.NUMBER; +import static edu.kit.informatik.modelrailwaysimulator.ui.command.CommandFactory.STEP; /** * Command used to advance the simulation.