get rid of Status.NO_INFO

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@428 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-01-03 14:21:08 +00:00
parent 289545f9f2
commit 29fd4249eb
5 changed files with 13 additions and 5 deletions

View file

@ -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.<Departure> emptyList(), null);
throw new IllegalArgumentException("unknown error " + code + ", " + text);
}

View file

@ -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.<Departure> emptyList(), null);
else if (mHeadCoarse.group(4) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
else if (mHeadCoarse.group(5) != null)

View file

@ -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.<Departure> emptyList(), null);
else if (mHeadCoarse.group(5) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
else if (mHeadCoarse.group(6) != null)

View file

@ -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.<Departure> emptyList(), null);
else if (mHeadCoarse.group(4) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
else if (mHeadCoarse.group(5) != null)

View file

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