arnekeller/kit-programmieren-ws1920-final1
1
0
Fork 0
mirror of https://gitlab.com/arnekeller/kit-programmieren-ws1920-final1.git synced 2024-11-24 01:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Move code into own package

Browse Source
This commit is contained in:
Arne Keller 2020-03-08 20:26:32 +01:00
parent 4fa7bf047b
commit 5e3e3b4bad
44 changed files with 173 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/edu/kit/informatik/Main.java → src/edu/kit/informatik/modelrailwaysimulator/Main.java
View File

@ -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.

3
src/edu/kit/informatik/MainTest.java → src/edu/kit/informatik/modelrailwaysimulator/MainTest.java
View File

@ -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.*;

6
src/edu/kit/informatik/model/Coach.java → src/edu/kit/informatik/modelrailwaysimulator/model/Coach.java
View File

@ -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.

4
src/edu/kit/informatik/model/DieselEngine.java → src/edu/kit/informatik/modelrailwaysimulator/model/DieselEngine.java
View File

@ -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.

4
src/edu/kit/informatik/model/ElectricalEngine.java → src/edu/kit/informatik/modelrailwaysimulator/model/ElectricalEngine.java
View File

@ -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.

4
src/edu/kit/informatik/model/Engine.java → src/edu/kit/informatik/modelrailwaysimulator/model/Engine.java
View File

@ -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.

4
src/edu/kit/informatik/model/FreightCoach.java → src/edu/kit/informatik/modelrailwaysimulator/model/FreightCoach.java
View File

@ -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.

6
src/edu/kit/informatik/model/ModelRailwaySimulation.java → src/edu/kit/informatik/modelrailwaysimulator/model/ModelRailwaySimulation.java
View File

@ -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;

4
src/edu/kit/informatik/model/PassengerCoach.java → src/edu/kit/informatik/modelrailwaysimulator/model/PassengerCoach.java
View File

@ -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.

2
src/edu/kit/informatik/model/Rail.java → src/edu/kit/informatik/modelrailwaysimulator/model/Rail.java
View File

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

4
src/edu/kit/informatik/model/RailwayNetwork.java → src/edu/kit/informatik/modelrailwaysimulator/model/RailwayNetwork.java
View File

@ -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;

4
src/edu/kit/informatik/model/RollingStock.java → src/edu/kit/informatik/modelrailwaysimulator/model/RollingStock.java
View File

@ -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.

4
src/edu/kit/informatik/model/SpecialCoach.java → src/edu/kit/informatik/modelrailwaysimulator/model/SpecialCoach.java
View File

@ -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.

4
src/edu/kit/informatik/model/SteamEngine.java → src/edu/kit/informatik/modelrailwaysimulator/model/SteamEngine.java
View File

@ -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.

4
src/edu/kit/informatik/model/Switch.java → src/edu/kit/informatik/modelrailwaysimulator/model/Switch.java
View File

@ -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;

4
src/edu/kit/informatik/model/Track.java → src/edu/kit/informatik/modelrailwaysimulator/model/Track.java
View File

@ -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;

4
src/edu/kit/informatik/model/Train.java → src/edu/kit/informatik/modelrailwaysimulator/model/Train.java
View File

@ -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;

4
src/edu/kit/informatik/model/TrainManager.java → src/edu/kit/informatik/modelrailwaysimulator/model/TrainManager.java
View File

@ -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;

4
src/edu/kit/informatik/model/TrainSet.java → src/edu/kit/informatik/modelrailwaysimulator/model/TrainSet.java
View File

@ -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.

2
src/edu/kit/informatik/model/Vector2D.java → src/edu/kit/informatik/modelrailwaysimulator/model/Vector2D.java
View File

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

10
src/edu/kit/informatik/ui/CoachType.java → src/edu/kit/informatik/modelrailwaysimulator/ui/CoachType.java
View File

@ -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.

6
src/edu/kit/informatik/ui/CommandLine.java → src/edu/kit/informatik/modelrailwaysimulator/ui/CommandLine.java
View File

@ -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.

10
src/edu/kit/informatik/ui/EngineType.java → src/edu/kit/informatik/modelrailwaysimulator/ui/EngineType.java
View File

@ -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.

2
src/edu/kit/informatik/ui/InvalidInputException.java → src/edu/kit/informatik/modelrailwaysimulator/ui/InvalidInputException.java
View File

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

12
src/edu/kit/informatik/ui/command/AddSwitch.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddSwitch.java
View File

@ -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.

12
src/edu/kit/informatik/ui/command/AddTrack.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrack.java
View File

@ -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.

14
src/edu/kit/informatik/ui/command/AddTrain.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/AddTrain.java
View File

@ -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.

6
src/edu/kit/informatik/ui/command/Command.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/Command.java
View File

@ -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.

6
src/edu/kit/informatik/ui/command/CommandFactory.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/CommandFactory.java
View File

@ -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;

16
src/edu/kit/informatik/ui/command/CreateCoach.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateCoach.java
View File

@ -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.

22
src/edu/kit/informatik/ui/command/CreateEngine.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateEngine.java
View File

@ -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.

18
src/edu/kit/informatik/ui/command/CreateTrainSet.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/CreateTrainSet.java
View File

@ -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.

12
src/edu/kit/informatik/ui/command/DeleteRollingStock.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteRollingStock.java
View File

@ -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.

12
src/edu/kit/informatik/ui/command/DeleteTrack.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrack.java
View File

@ -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.

12
src/edu/kit/informatik/ui/command/DeleteTrain.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/DeleteTrain.java
View File

@ -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.

8
src/edu/kit/informatik/ui/command/ListCoaches.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListCoaches.java
View File

@ -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.

8
src/edu/kit/informatik/ui/command/ListEngines.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListEngines.java
View File

@ -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.

8
src/edu/kit/informatik/ui/command/ListTracks.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTracks.java
View File

@ -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.

8
src/edu/kit/informatik/ui/command/ListTrainSets.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrainSets.java
View File

@ -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.

8
src/edu/kit/informatik/ui/command/ListTrains.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/ListTrains.java
View File

@ -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.

16
src/edu/kit/informatik/ui/command/PutTrain.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/PutTrain.java
View File

@ -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.

16
src/edu/kit/informatik/ui/command/SetSwitch.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/SetSwitch.java
View File

@ -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.

10
src/edu/kit/informatik/ui/command/ShowTrain.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/ShowTrain.java
View File

@ -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.

14
src/edu/kit/informatik/ui/command/Step.java → src/edu/kit/informatik/modelrailwaysimulator/ui/command/Step.java
View File

@ -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.