Reorganize code

src/edu/kit/informatik/model/Coach.java

@@ -1,4 +1,6 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
+
+import edu.kit.informatik.ui.CoachType;
 
 /**
  * A coach.

src/edu/kit/informatik/model/DieselEngine.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Diesel engine.

src/edu/kit/informatik/model/ElectricalEngine.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Electrical engine.

src/edu/kit/informatik/model/Engine.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Generic engine, is usually either diesel, steam or electric.

src/edu/kit/informatik/model/ModelRailwaySimulation.java

@@ -1,4 +1,7 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
+
+import edu.kit.informatik.ui.CoachType;
+import edu.kit.informatik.Terminal;
 
 import java.util.*;
 import java.util.stream.Collectors;

src/edu/kit/informatik/model/Rail.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Generic rail that other rails can connect to.

src/edu/kit/informatik/model/RollingStock.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * A rolling stock. Is usually an engine, train set or coach.

src/edu/kit/informatik/model/SteamEngine.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Steam engine.

src/edu/kit/informatik/model/Switch.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 import java.util.Objects;
 

src/edu/kit/informatik/model/Track.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 import java.util.Objects;
 

src/edu/kit/informatik/model/Train.java

@@ -1,4 +1,6 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
+
+import edu.kit.informatik.Terminal;
 
 import java.util.ArrayList;
 import java.util.List;

src/edu/kit/informatik/model/TrainSet.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Train set.

src/edu/kit/informatik/model/Vector2D.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 import java.util.Objects;
 

src/edu/kit/informatik/ui/CoachType.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
 /**
  * Type of a coach.

src/edu/kit/informatik/ui/CommandLine.java

@@ -1,7 +1,9 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
-import edu.kit.informatik.command.Command;
+import edu.kit.informatik.model.ModelRailwaySimulation;
-import edu.kit.informatik.command.CommandFactory;
+import edu.kit.informatik.Terminal;
+import edu.kit.informatik.ui.command.Command;
+import edu.kit.informatik.ui.command.CommandFactory;
 
 /**
  * Interactive simulation runner, gets user inputs and processes commands specified.

src/edu/kit/informatik/ui/EngineType.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
 /**
  * Type of locomotive. Can be either diesel, steam or electrical.

src/edu/kit/informatik/ui/InvalidInputException.java

@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
 /**
  * Thrown on invalid user input.

src/edu/kit/informatik/ui/command/AddSwitch.java

@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/AddTrack.java

@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/AddTrain.java

@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
-import edu.kit.informatik.RollingStock;
+import edu.kit.informatik.model.RollingStock;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/Command.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command that can be applied to a simulation.

src/edu/kit/informatik/ui/command/CommandFactory.java

@@ -1,6 +1,10 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
 import edu.kit.informatik.*;
+import edu.kit.informatik.model.Vector2D;
+import edu.kit.informatik.ui.CoachType;
+import edu.kit.informatik.ui.EngineType;
+import edu.kit.informatik.ui.InvalidInputException;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/edu/kit/informatik/ui/command/CreateCoach.java

@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.CoachType;
+import edu.kit.informatik.ui.CoachType;
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/CreateEngine.java

@@ -1,6 +1,8 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
 import edu.kit.informatik.*;
+import edu.kit.informatik.model.*;
+import edu.kit.informatik.ui.EngineType;
 
 /**
  * Command used to create a single engine.

src/edu/kit/informatik/ui/command/CreateTrainSet.java

@@ -1,8 +1,8 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
-import edu.kit.informatik.TrainSet;
+import edu.kit.informatik.model.TrainSet;
 
 /**
  * Command used to add a new train set.

src/edu/kit/informatik/ui/command/DeleteRollingStock.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/DeleteTrack.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/DeleteTrain.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/ListCoaches.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of coaches.

src/edu/kit/informatik/ui/command/ListEngines.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of engines.

src/edu/kit/informatik/ui/command/ListTracks.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of tracks and switches.

src/edu/kit/informatik/ui/command/ListTrainSets.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of train sets on the terminal.

src/edu/kit/informatik/ui/command/ListTrains.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of trains on the terminal.

src/edu/kit/informatik/ui/command/PutTrain.java

@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/SetSwitch.java

@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**

src/edu/kit/informatik/ui/command/ShowTrain.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a train as ASCII art.

src/edu/kit/informatik/ui/command/Step.java

@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to advance the simulation.