Try skipping XML whitespaces more elegantly

This commit is contained in:
Andreas Schildbach 2013-11-08 20:29:02 +01:00
parent 34f44f174b
commit f7f3c5080d
2 changed files with 19 additions and 15 deletions

View file

@ -486,9 +486,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
XmlPullUtil.enter(pp, "LocationList");
if (pp.isWhitespace())
pp.next();
while (XmlPullUtil.test(pp, "StopLocation") || XmlPullUtil.test(pp, "CoordLocation"))
{
final String name = ParserUtils.resolveEntities(XmlPullUtil.attr(pp, "name"));
@ -521,9 +518,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
XmlPullUtil.enter(pp);
XmlPullUtil.exit(pp);
}
if (pp.isWhitespace())
pp.next();
}
XmlPullUtil.exit(pp, "LocationList");
@ -1123,10 +1117,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
throw new IllegalStateException("error " + code + " " + XmlPullUtil.attr(pp, "text"));
}
// workaround for broken firstConDiffersFromReqDate="true" as text node
if (pp.getEventType() == XmlPullParser.TEXT)
pp.nextTag();
final String c = XmlPullUtil.test(pp, "ConResCtxt") ? XmlPullUtil.text(pp) : null;
final Context context;
if (previousContext == null)