format dates in UTC

1 files changed, 15 insertions, 8 deletions

diff --git a/src/Q10/Station.java b/src/Q10/Station.java
index 906ca51..3fcca70 100644
--- a/src/Q10/Station.java
+++ b/src/Q10/Station.java
@@ -1,5 +1,6 @@
 package Q10;
 
+import java.text.*;
 import java.util.*;
 
 public class Station {
@@ -27,18 +28,10 @@ public class Station {
     return day;
   }
 
-  public String getArrival() {
-    return this.getArrivalDate().toString();
-  }
-
   public String getCity() {
     return this.city;
   }
 
-  public String getDeparture() {
-    return getDepartureDate().toString();
-  }
-
   public void setArrivalDate(Date arrival) {
     this.arrival = arrival;
   }
@@ -54,4 +47,18 @@ public class Station {
   public void setDepartureDate(Date departure) {
     this.departure = departure;
   }
+
+  public String getArrival() {
+    return formatDate(this.arrival);
+  }
+
+  public String getDeparture() {
+    return formatDate(this.departure);
+  }
+
+  private String formatDate(Date date) {
+    DateFormat format = new SimpleDateFormat("HH:mm");
+    format.setTimeZone(TimeZone.getTimeZone("UTC"));
+    return format.format(date);
+  }
 }