From 79db1548913b77612678847c36d168ecd62f9b07 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Thu, 22 Oct 2020 10:06:55 +0200
Subject: [PATCH] AbstractEfaProvider: Replace a few XmlPullUtil.test() with
 require().

---
 src/de/schildbach/pte/AbstractEfaProvider.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index aa858dab..24c6dbad 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -659,8 +659,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
 
     private String processItdOdv(final XmlPullParser pp, final String expectedUsage,
             final ProcessItdOdvCallback callback) throws XmlPullParserException, IOException {
-        if (!XmlPullUtil.test(pp, "itdOdv"))
-            throw new IllegalStateException("expecting <itdOdv />");
+        XmlPullUtil.require(pp, "itdOdv");
 
         final String usage = XmlPullUtil.attr(pp, "usage");
         if (expectedUsage != null && !usage.equals(expectedUsage))
@@ -725,8 +724,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
     }
 
     private String processItdOdvPlace(final XmlPullParser pp) throws XmlPullParserException, IOException {
-        if (!XmlPullUtil.test(pp, "itdOdvPlace"))
-            throw new IllegalStateException("expecting <itdOdvPlace />");
+        XmlPullUtil.require(pp, "itdOdvPlace");
 
         final String placeState = XmlPullUtil.attr(pp, "state");
 
@@ -743,8 +741,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
 
     private Location processOdvNameElem(final XmlPullParser pp, String type, final String defaultPlace)
             throws XmlPullParserException, IOException {
-        if (!XmlPullUtil.test(pp, "odvNameElem"))
-            throw new IllegalStateException("expecting <odvNameElem />");
+        XmlPullUtil.require(pp, "odvNameElem");
 
         if ("any".equals(type))
             type = XmlPullUtil.attr(pp, "anyType");