show intermediate stops in directions

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@332 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-10-30 17:35:59 +00:00
parent 0edcbe09a4
commit f5b3752950
9 changed files with 220 additions and 90 deletions

View file

@ -30,6 +30,11 @@ public final class XmlPullUtil
throw new IllegalStateException("cannot find <" + tagName + " />");
}
public static void require(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
{
pp.require(XmlPullParser.START_TAG, null, tagName);
}
/**
* enters current tag
*
@ -45,7 +50,30 @@ public final class XmlPullUtil
pp.next();
}
public static void enter(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
{
pp.require(XmlPullParser.START_TAG, null, tagName);
enter(pp);
}
public static void exit(final XmlPullParser pp) throws XmlPullParserException, IOException
{
exitSkipToEnd(pp);
if (pp.getEventType() != XmlPullParser.END_TAG)
throw new IllegalStateException("expecting end tag to exit");
pp.next();
}
public static void exit(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
{
exitSkipToEnd(pp);
pp.require(XmlPullParser.END_TAG, null, tagName);
pp.next();
}
private static void exitSkipToEnd(final XmlPullParser pp) throws XmlPullParserException, IOException
{
while (pp.getEventType() != XmlPullParser.END_TAG)
{
@ -56,11 +84,6 @@ public final class XmlPullUtil
else
throw new IllegalStateException();
}
if (pp.getEventType() != XmlPullParser.END_TAG)
throw new IllegalStateException("expecting end tag to exit");
pp.next();
}
public static boolean test(final XmlPullParser pp, final String tagName) throws XmlPullParserException
@ -74,11 +97,6 @@ public final class XmlPullUtil
pp.next();
}
public static void require(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
{
pp.require(XmlPullParser.START_TAG, null, tagName);
}
public static String attr(final XmlPullParser pp, final String attrName)
{
return pp.getAttributeValue(null, attrName);