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

some more sanity checks

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@287 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-13 08:41:31 +00:00
parent 1406f2f00f
commit dd9461585e
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,11 +75,10 @@ public abstract class AbstractEfaProvider implements NetworkProvider
pp.setInput(is, DEFAULT_ENCODING); pp.setInput(is, DEFAULT_ENCODING);
// parse odv name elements // parse odv name elements
XmlPullUtil.jumpToStartTag(pp, null, "itdOdv"); if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"origin".equals(pp.getAttributeValue(null, "usage")))
final String usage = pp.getAttributeValue(null, "usage"); throw new IllegalStateException("cannot find <itdOdv usage=\"origin\" />");
if (!"origin".equals(usage)) if (!XmlPullUtil.nextStartTagInsideTree(pp, null, "itdOdvName"))
throw new IllegalStateException(); throw new IllegalStateException("cannot find <itdOdvName />");
XmlPullUtil.nextStartTagInsideTree(pp, null, "itdOdvName");
final String nameState = pp.getAttributeValue(null, "state"); final String nameState = pp.getAttributeValue(null, "state");
if ("identified".equals(nameState) || "list".equals(nameState)) if ("identified".equals(nameState) || "list".equals(nameState))
while (XmlPullUtil.nextStartTagInsideTree(pp, null, "odvNameElem")) while (XmlPullUtil.nextStartTagInsideTree(pp, null, "odvNameElem"))
@ -218,9 +217,12 @@ public abstract class AbstractEfaProvider implements NetworkProvider
final XmlPullParser pp = factory.newPullParser(); final XmlPullParser pp = factory.newPullParser();
pp.setInput(is, DEFAULT_ENCODING); pp.setInput(is, DEFAULT_ENCODING);
XmlPullUtil.jumpToStartTag(pp, null, "itdOdvName"); if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"dm".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException("cannot find <itdOdv usage=\"dm\" />");
if (!XmlPullUtil.nextStartTagInsideTree(pp, null, "itdOdvName"))
throw new IllegalStateException("cannot find <itdOdvName />");
final String nameState = pp.getAttributeValue(null, "state"); final String nameState = pp.getAttributeValue(null, "state");
if (nameState.equals("identified")) if ("identified".equals(nameState))
{ {
final List<Station> stations = new ArrayList<Station>(); final List<Station> stations = new ArrayList<Station>();
@ -279,7 +281,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
else else
return new NearbyStationsResult(uri, stations.subList(0, maxStations)); return new NearbyStationsResult(uri, stations.subList(0, maxStations));
} }
else if (nameState.equals("notidentified")) else if ("notidentified".equals(nameState))
{ {
return new NearbyStationsResult(uri, NearbyStationsResult.Status.INVALID_STATION); return new NearbyStationsResult(uri, NearbyStationsResult.Status.INVALID_STATION);
} }
@ -591,7 +593,10 @@ public abstract class AbstractEfaProvider implements NetworkProvider
final XmlPullParser pp = factory.newPullParser(); final XmlPullParser pp = factory.newPullParser();
pp.setInput(is, DEFAULT_ENCODING); pp.setInput(is, DEFAULT_ENCODING);
XmlPullUtil.jumpToStartTag(pp, null, "itdOdvName"); if (!XmlPullUtil.jumpToStartTag(pp, null, "itdOdv") || !"dm".equals(pp.getAttributeValue(null, "usage")))
throw new IllegalStateException("cannot find <itdOdv usage=\"dm\" />");
if (!XmlPullUtil.nextStartTagInsideTree(pp, null, "itdOdvName"))
throw new IllegalStateException("cannot find <itdOdvName />");
final String nameState = pp.getAttributeValue(null, "state"); final String nameState = pp.getAttributeValue(null, "state");
if ("identified".equals(nameState)) if ("identified".equals(nameState))
{ {