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

Reorganize code

Browse Source
This commit is contained in:
Arne Keller 2020-02-16 15:01:33 +01:00
parent bfccc89237
commit 9aa8cc2384
37 changed files with 79 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,7 +1,9 @@
package edu.kit.informatik;
package edu.kit.informatik.ui;
import edu.kit.informatik.command.Command;
import edu.kit.informatik.command.CommandFactory;
import edu.kit.informatik.model.ModelRailwaySimulation;
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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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