Skip to content
Snippets Groups Projects
Commit 46764555 authored by Johanne Fixdal's avatar Johanne Fixdal
Browse files

Test gitlab push

parent 0befacb6
Branches
Tags
No related merge requests found
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="885012ef-f9bd-49ba-ae4a-3de0b4c477fd" name="Changes" comment="Initialized repo and made hello world"> <list default="true" id="885012ef-f9bd-49ba-ae4a-3de0b4c477fd" name="Changes" comment="Initialized repo and made hello world">
<change afterPath="$PROJECT_DIR$/src/main/java/edu/ntnu/stud/TrainDeparture.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/edu/ntnu/stud/TrainDeparture.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/ntnu/stud/TrainDeparture.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/edu/ntnu/stud/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/edu/ntnu/stud/Main.class" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -96,7 +96,8 @@ ...@@ -96,7 +96,8 @@
<updated>1697190733967</updated> <updated>1697190733967</updated>
<workItem from="1697190736334" duration="2154000" /> <workItem from="1697190736334" duration="2154000" />
<workItem from="1697277327863" duration="1087000" /> <workItem from="1697277327863" duration="1087000" />
<workItem from="1697278462833" duration="665000" /> <workItem from="1697278462833" duration="2550000" />
<workItem from="1697281569682" duration="334000" />
</task> </task>
<task id="LOCAL−00001" summary="Initialized repo and made hello world"> <task id="LOCAL−00001" summary="Initialized repo and made hello world">
<option name="closed" value="true" /> <option name="closed" value="true" />
...@@ -105,7 +106,14 @@ ...@@ -105,7 +106,14 @@
<option name="presentableId" value="LOCAL−00001" /> <option name="presentableId" value="LOCAL−00001" />
<updated>1697191827008</updated> <updated>1697191827008</updated>
</task> </task>
<option name="localTasksCounter" value="2" /> <task id="LOCAL−00002" summary="Initialized repo and made hello world">
<option name="closed" value="true" />
<created>1697281162307</created>
<option name="number" value="LOCAL−00002" />
<option name="presentableId" value="LOCAL−00002" />
<updated>1697281162307</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -2,15 +2,16 @@ package edu.ntnu.stud; ...@@ -2,15 +2,16 @@ package edu.ntnu.stud;
public class TrainDeparture { public class TrainDeparture {
private int depatureTime = 00:00; private int depatureTime = 00:00;
private String line = ""; private String line = "";
private String trainNumber = ""; private String trainNumber = "";
private String destination = ""; private String destination = "";
private int track = 0; private int track = 0;
private int delay = 00:00; private int delay = 00:00;
// delay-method is not final, due to changes
private TrainDeparture(int depatureTime, String line, String trainNumber, String destination, int
track, int delay) {
private TrainDeparture() {
} }
......
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment