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

Rename XmlPullUtil.exit() to skipExit().

Browse source
This commit is contained in:
Andreas Schildbach 2014-08-10 16:28:46 +02:00
parent 96c3ce459e
commit 0b5ee4ffb7
3 changed files with 113 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

14
enabler/src/de/schildbach/pte/util/XmlPullUtil.java
View file

@ -49,9 +49,9 @@ public final class XmlPullUtil
enter(pp);
}
public static void exit(final XmlPullParser pp) throws XmlPullParserException, IOException
public static void skipExit(final XmlPullParser pp) throws XmlPullParserException, IOException
{
exitSkipToEnd(pp);
skipToEnd(pp);
if (pp.getEventType() != XmlPullParser.END_TAG)
throw new IllegalStateException("expecting end tag to exit");
@ -59,15 +59,15 @@ public final class XmlPullUtil
pp.next();
}
public static void exit(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
public static void skipExit(final XmlPullParser pp, final String tagName) throws XmlPullParserException, IOException
{
exitSkipToEnd(pp);
skipToEnd(pp);
pp.require(XmlPullParser.END_TAG, null, tagName);
pp.next();
}
private static void exitSkipToEnd(final XmlPullParser pp) throws XmlPullParserException, IOException
private static void skipToEnd(final XmlPullParser pp) throws XmlPullParserException, IOException
{
while (pp.getEventType() != XmlPullParser.END_TAG)
{
@ -95,7 +95,7 @@ public final class XmlPullUtil
if (!pp.isEmptyElementTag())
{
enter(pp, tagName);
exit(pp, tagName);
skipExit(pp, tagName);
}
else
{
@ -178,7 +178,7 @@ public final class XmlPullUtil
{
XmlPullUtil.enter(pp, tagName);
final String value = pp.getText();
XmlPullUtil.exit(pp, tagName);
XmlPullUtil.skipExit(pp, tagName);
return value != null ? value.trim() : null;
}