From e6c677f72abf068c4179c1ddf1890820d4f91f6b Mon Sep 17 00:00:00 2001 From: "andreas.schildbach" Date: Thu, 23 Sep 2010 11:17:38 +0000 Subject: [PATCH] get rid of currentTime git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@182 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BahnProvider.java | 2 +- src/de/schildbach/pte/MvvProvider.java | 2 +- src/de/schildbach/pte/OebbProvider.java | 2 +- src/de/schildbach/pte/QueryDeparturesResult.java | 7 +------ src/de/schildbach/pte/RmvProvider.java | 2 +- src/de/schildbach/pte/SbbProvider.java | 2 +- src/de/schildbach/pte/SncbProvider.java | 2 +- src/de/schildbach/pte/TflProvider.java | 2 +- src/de/schildbach/pte/VbbProvider.java | 2 +- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index fb78db2f..fd34e03e 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -548,7 +548,7 @@ public final class BahnProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, stationId, location, currentTime, departures); + return new QueryDeparturesResult(uri, stationId, location, departures); } else { diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java index 2934c6e5..b630fffc 100644 --- a/src/de/schildbach/pte/MvvProvider.java +++ b/src/de/schildbach/pte/MvvProvider.java @@ -683,7 +683,7 @@ public class MvvProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, stationId, location, currentTime, departures); + return new QueryDeparturesResult(uri, stationId, location, departures); } else { diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java index 0e57939b..fda33008 100644 --- a/src/de/schildbach/pte/OebbProvider.java +++ b/src/de/schildbach/pte/OebbProvider.java @@ -526,7 +526,7 @@ public class OebbProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, locationId, location, null, departures); + return new QueryDeparturesResult(uri, locationId, location, departures); } catch (final JSONException x) { diff --git a/src/de/schildbach/pte/QueryDeparturesResult.java b/src/de/schildbach/pte/QueryDeparturesResult.java index abd69cd1..632ba7c5 100644 --- a/src/de/schildbach/pte/QueryDeparturesResult.java +++ b/src/de/schildbach/pte/QueryDeparturesResult.java @@ -17,7 +17,6 @@ package de.schildbach.pte; -import java.util.Date; import java.util.List; /** @@ -34,17 +33,14 @@ public final class QueryDeparturesResult public final Status status; public final int locationId; public final String location; - public final Date currentTime; public final List departures; - public QueryDeparturesResult(final String uri, final int locationId, final String location, final Date currentTime, - final List departures) + public QueryDeparturesResult(final String uri, final int locationId, final String location, final List departures) { this.uri = uri; this.status = Status.OK; this.locationId = locationId; this.location = location; - this.currentTime = currentTime; this.departures = departures; } @@ -54,7 +50,6 @@ public final class QueryDeparturesResult this.status = status; this.locationId = 0; this.location = null; - this.currentTime = null; this.departures = null; } } diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java index 864c99ba..b6f4155a 100644 --- a/src/de/schildbach/pte/RmvProvider.java +++ b/src/de/schildbach/pte/RmvProvider.java @@ -580,7 +580,7 @@ public class RmvProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, stationId, location, currentTime, departures); + return new QueryDeparturesResult(uri, stationId, location, departures); } else { diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java index 3db67992..8264edae 100644 --- a/src/de/schildbach/pte/SbbProvider.java +++ b/src/de/schildbach/pte/SbbProvider.java @@ -521,7 +521,7 @@ public class SbbProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, locationId, location, currentTime, departures); + return new QueryDeparturesResult(uri, locationId, location, departures); } else { diff --git a/src/de/schildbach/pte/SncbProvider.java b/src/de/schildbach/pte/SncbProvider.java index 2a74b150..333e6195 100644 --- a/src/de/schildbach/pte/SncbProvider.java +++ b/src/de/schildbach/pte/SncbProvider.java @@ -186,7 +186,7 @@ public class SncbProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, 0, location, currentTime, departures); + return new QueryDeparturesResult(uri, 0, location, departures); } else { diff --git a/src/de/schildbach/pte/TflProvider.java b/src/de/schildbach/pte/TflProvider.java index 4bd5c23d..3151690d 100644 --- a/src/de/schildbach/pte/TflProvider.java +++ b/src/de/schildbach/pte/TflProvider.java @@ -144,7 +144,7 @@ public class TflProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, 0, location, null, departures); + return new QueryDeparturesResult(uri, 0, location, departures); } else { diff --git a/src/de/schildbach/pte/VbbProvider.java b/src/de/schildbach/pte/VbbProvider.java index a54c01ba..853693a7 100644 --- a/src/de/schildbach/pte/VbbProvider.java +++ b/src/de/schildbach/pte/VbbProvider.java @@ -600,7 +600,7 @@ public final class VbbProvider implements NetworkProvider } } - return new QueryDeparturesResult(uri, stationId, location, currentTime, departures); + return new QueryDeparturesResult(uri, stationId, location, departures); } else {