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

remove superfluous departureQueryUri() method from interface

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@304 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-17 15:50:02 +00:00
parent 1e49dd0e46
commit 4d4355ac4f
36 changed files with 126 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -634,8 +634,12 @@ public abstract class AbstractEfaProvider implements NetworkProvider
throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "'");
}
public QueryDeparturesResult queryDepartures(final String uri) throws IOException
protected abstract String departuresQueryUri(String stationId, int maxDepartures);
public QueryDeparturesResult queryDepartures(final String stationId, final int maxDepartures) throws IOException
{
final String uri = departuresQueryUri(stationId, maxDepartures);
InputStream is = null;
try
{
@ -691,11 +695,11 @@ public abstract class AbstractEfaProvider implements NetworkProvider
XmlPullUtil.skipRestOfTree(pp);
}
return new QueryDeparturesResult(uri, locationId, location, departures);
return new QueryDeparturesResult(locationId, location, departures);
}
else if ("notidentified".equals(nameState))
{
return new QueryDeparturesResult(uri, QueryDeparturesResult.Status.INVALID_STATION);
return new QueryDeparturesResult(QueryDeparturesResult.Status.INVALID_STATION, Integer.parseInt(stationId));
}
else
{
@ -708,11 +712,11 @@ public abstract class AbstractEfaProvider implements NetworkProvider
}
catch (final FileNotFoundException x)
{
return new QueryDeparturesResult(uri, QueryDeparturesResult.Status.SERVICE_DOWN);
return new QueryDeparturesResult(QueryDeparturesResult.Status.SERVICE_DOWN, Integer.parseInt(stationId));
}
catch (final SocketTimeoutException x)
{
return new QueryDeparturesResult(uri, QueryDeparturesResult.Status.SERVICE_DOWN);
return new QueryDeparturesResult(QueryDeparturesResult.Status.SERVICE_DOWN, Integer.parseInt(stationId));
}
finally
{