From 29fd4249eba3377e99325e906e2e89c1148d50f1 Mon Sep 17 00:00:00 2001 From: "andreas.schildbach@gmail.com" Date: Mon, 3 Jan 2011 14:21:08 +0000 Subject: [PATCH] get rid of Status.NO_INFO git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@428 0924bc21-9374-b0fa-ee44-9ff1593b38f0 --- src/de/schildbach/pte/BahnProvider.java | 4 +++- src/de/schildbach/pte/NasaProvider.java | 4 +++- src/de/schildbach/pte/SbbProvider.java | 4 +++- src/de/schildbach/pte/VgsProvider.java | 4 +++- src/de/schildbach/pte/dto/QueryDeparturesResult.java | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java index a23fa97c..4f0fe10a 100644 --- a/src/de/schildbach/pte/BahnProvider.java +++ b/src/de/schildbach/pte/BahnProvider.java @@ -22,6 +22,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; @@ -478,7 +479,8 @@ public final class BahnProvider extends AbstractHafasProvider if (code.equals("H730")) // Your input is not valid return new QueryDeparturesResult(QueryDeparturesResult.Status.INVALID_STATION, Integer.parseInt(stationId)); if (code.equals("H890")) // No trains in result - return new QueryDeparturesResult(QueryDeparturesResult.Status.NO_INFO, Integer.parseInt(stationId)); + return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), null), + Collections. emptyList(), null); throw new IllegalArgumentException("unknown error " + code + ", " + text); } diff --git a/src/de/schildbach/pte/NasaProvider.java b/src/de/schildbach/pte/NasaProvider.java index 22f2754a..7a83e557 100644 --- a/src/de/schildbach/pte/NasaProvider.java +++ b/src/de/schildbach/pte/NasaProvider.java @@ -22,6 +22,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; @@ -142,7 +143,8 @@ public class NasaProvider extends AbstractHafasProvider { // messages if (mHeadCoarse.group(3) != null) - return new QueryDeparturesResult(Status.NO_INFO, Integer.parseInt(stationId)); + return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), null), + Collections. emptyList(), null); else if (mHeadCoarse.group(4) != null) return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId)); else if (mHeadCoarse.group(5) != null) diff --git a/src/de/schildbach/pte/SbbProvider.java b/src/de/schildbach/pte/SbbProvider.java index 52999017..6e1c69f0 100644 --- a/src/de/schildbach/pte/SbbProvider.java +++ b/src/de/schildbach/pte/SbbProvider.java @@ -20,6 +20,7 @@ package de.schildbach.pte; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; @@ -123,7 +124,8 @@ public class SbbProvider extends AbstractHafasProvider { // messages if (mHeadCoarse.group(3) != null) - return new QueryDeparturesResult(Status.NO_INFO, Integer.parseInt(stationId)); + return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), null), + Collections. emptyList(), null); else if (mHeadCoarse.group(5) != null) return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId)); else if (mHeadCoarse.group(6) != null) diff --git a/src/de/schildbach/pte/VgsProvider.java b/src/de/schildbach/pte/VgsProvider.java index bc1891e0..c77d9af3 100644 --- a/src/de/schildbach/pte/VgsProvider.java +++ b/src/de/schildbach/pte/VgsProvider.java @@ -22,6 +22,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; @@ -141,7 +142,8 @@ public class VgsProvider extends AbstractHafasProvider { // messages if (mHeadCoarse.group(3) != null) - return new QueryDeparturesResult(Status.NO_INFO, Integer.parseInt(stationId)); + return new QueryDeparturesResult(new Location(LocationType.STATION, Integer.parseInt(stationId), null), + Collections. emptyList(), null); else if (mHeadCoarse.group(4) != null) return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId)); else if (mHeadCoarse.group(5) != null) diff --git a/src/de/schildbach/pte/dto/QueryDeparturesResult.java b/src/de/schildbach/pte/dto/QueryDeparturesResult.java index 7e2ce29f..e8dbe8f6 100644 --- a/src/de/schildbach/pte/dto/QueryDeparturesResult.java +++ b/src/de/schildbach/pte/dto/QueryDeparturesResult.java @@ -26,7 +26,7 @@ public final class QueryDeparturesResult { public enum Status { - OK, NO_INFO, INVALID_STATION, SERVICE_DOWN + OK, INVALID_STATION, SERVICE_DOWN } public final Status status;