From de2a0a614f095cde9bd1532d2c1d9b0235157563 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sun, 17 Oct 2021 22:09:13 +0200
Subject: [PATCH] ParserUtils: extract hardcoded EUR currency into constant

---
 src/de/schildbach/pte/NegentweeProvider.java | 7 +++----
 src/de/schildbach/pte/VrsProvider.java       | 6 +++---
 src/de/schildbach/pte/util/ParserUtils.java  | 3 +++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/de/schildbach/pte/NegentweeProvider.java b/src/de/schildbach/pte/NegentweeProvider.java
index 07718f5c..2c7eac32 100644
--- a/src/de/schildbach/pte/NegentweeProvider.java
+++ b/src/de/schildbach/pte/NegentweeProvider.java
@@ -23,7 +23,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Currency;
 import java.util.Date;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -497,9 +496,9 @@ public class NegentweeProvider extends AbstractNetworkProvider {
         List<Fare> tripFares = null;
         if (fareInfo.getBoolean("complete")) {
             tripFares = Arrays.asList(
-                new Fare("Full-price", Fare.Type.ADULT, Currency.getInstance("EUR"),
+                new Fare("Full-price", Fare.Type.ADULT, ParserUtils.CURRENCY_EUR,
                     fareInfo.getInt("fullPriceCents") / 100, null, null),
-                new Fare("Reduced-price", Fare.Type.ADULT, Currency.getInstance("EUR"),
+                new Fare("Reduced-price", Fare.Type.ADULT, ParserUtils.CURRENCY_EUR,
                     fareInfo.getInt("reducedPriceCents") / 100, null, null));
         }
 
@@ -531,7 +530,7 @@ public class NegentweeProvider extends AbstractNetworkProvider {
             }
         }
 
-        return new Fare(fareLeg.getString("operatorString"), Fare.Type.ADULT, Currency.getInstance("EUR"), farePrice,
+        return new Fare(fareLeg.getString("operatorString"), Fare.Type.ADULT, ParserUtils.CURRENCY_EUR, farePrice,
                 null, null);
     }
 
diff --git a/src/de/schildbach/pte/VrsProvider.java b/src/de/schildbach/pte/VrsProvider.java
index b764f28d..385a391a 100644
--- a/src/de/schildbach/pte/VrsProvider.java
+++ b/src/de/schildbach/pte/VrsProvider.java
@@ -25,7 +25,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Currency;
 import java.util.Date;
 import java.util.EnumSet;
 import java.util.GregorianCalendar;
@@ -41,6 +40,7 @@ import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
+import de.schildbach.pte.util.ParserUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -865,11 +865,11 @@ public class VrsProvider extends AbstractNetworkProvider {
                                                                                                        // "4"
 
             if (name != null && price != 0.0 && level != null) {
-                fares.add(new Fare(name, Fare.Type.ADULT, Currency.getInstance("EUR"), price, level, null /* units */));
+                fares.add(new Fare(name, Fare.Type.ADULT, ParserUtils.CURRENCY_EUR, price, level, null /* units */));
             } else if (name != null && name.equals("NRW-Tarif") && text != null) {
                 Matcher matcher = nrwTarifPattern.matcher(text);
                 if (matcher.find()) {
-                    fares.add(new Fare(name, Fare.Type.ADULT, Currency.getInstance("EUR"),
+                    fares.add(new Fare(name, Fare.Type.ADULT, ParserUtils.CURRENCY_EUR,
                             Float.parseFloat(matcher.group(0).replace(",", ".")), null /* level */, null /* units */));
                 }
             }
diff --git a/src/de/schildbach/pte/util/ParserUtils.java b/src/de/schildbach/pte/util/ParserUtils.java
index 0ed6f05f..1dca916b 100644
--- a/src/de/schildbach/pte/util/ParserUtils.java
+++ b/src/de/schildbach/pte/util/ParserUtils.java
@@ -24,6 +24,7 @@ import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
 import java.util.Calendar;
+import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.regex.Matcher;
@@ -40,6 +41,8 @@ public final class ParserUtils {
     private static final Pattern P_HTML_BREAKS = Pattern.compile("(<br\\s*/>)+",
             Pattern.DOTALL | Pattern.CASE_INSENSITIVE);
 
+    public static final Currency CURRENCY_EUR = Currency.getInstance("EUR");
+
     public static String formatHtml(final CharSequence html) {
         if (html == null)
             return null;