mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-17 08:29:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

get rid of Status.NO_INFO

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
src/de/schildbach/pte/BahnProvider.java
View file

@ -22,6 +22,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
@ -478,7 +479,8 @@ public final class BahnProvider extends AbstractHafasProvider
if (code.equals("H730")) // Your input is not valid if (code.equals("H730")) // Your input is not valid
return new QueryDeparturesResult(QueryDeparturesResult.Status.INVALID_STATION, Integer.parseInt(stationId)); return new QueryDeparturesResult(QueryDeparturesResult.Status.INVALID_STATION, Integer.parseInt(stationId));
if (code.equals("H890")) // No trains in result 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); throw new IllegalArgumentException("unknown error " + code + ", " + text);
} }

4
src/de/schildbach/pte/NasaProvider.java
View file

@ -22,6 +22,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
@ -142,7 +143,8 @@ public class NasaProvider extends AbstractHafasProvider
{ {
// messages // messages
if (mHeadCoarse.group(3) != null) 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) else if (mHeadCoarse.group(4) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId)); return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
else if (mHeadCoarse.group(5) != null) else if (mHeadCoarse.group(5) != null)

4
src/de/schildbach/pte/SbbProvider.java
View file

@ -20,6 +20,7 @@ package de.schildbach.pte;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
@ -123,7 +124,8 @@ public class SbbProvider extends AbstractHafasProvider
{ {
// messages // messages
if (mHeadCoarse.group(3) != null) 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) else if (mHeadCoarse.group(5) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId)); return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
else if (mHeadCoarse.group(6) != null) else if (mHeadCoarse.group(6) != null)

4
src/de/schildbach/pte/VgsProvider.java
View file

@ -22,6 +22,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List; import java.util.List;
@ -141,7 +142,8 @@ public class VgsProvider extends AbstractHafasProvider
{ {
// messages // messages
if (mHeadCoarse.group(3) != null) 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) else if (mHeadCoarse.group(4) != null)
return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId)); return new QueryDeparturesResult(Status.INVALID_STATION, Integer.parseInt(stationId));
else if (mHeadCoarse.group(5) != null) else if (mHeadCoarse.group(5) != null)

2
src/de/schildbach/pte/dto/QueryDeparturesResult.java
View file

@ -26,7 +26,7 @@ public final class QueryDeparturesResult
{ {
public enum Status public enum Status
{ {
OK, NO_INFO, INVALID_STATION, SERVICE_DOWN OK, INVALID_STATION, SERVICE_DOWN
} }
public final Status status; public final Status status;