From e10c9ba457b8f238f9d2bf375a879160922cb3a9 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 25 Aug 2013 15:17:05 +0200 Subject: refactoring: simplify logical expression flow --- main/src/cgeo/geocaching/settings/Settings.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'main/src') diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index 96f0343..3597cd0 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -548,16 +548,9 @@ public final class Settings { static boolean getImperialUnitsDefault() { final String countryCode = Locale.getDefault().getCountry(); - if ("US".equals(countryCode)) { - return true; // USA - } - if ("LR".equals(countryCode)) { - return true; // Liberia - } - if ("MM".equals(countryCode)) { - return true; // Burma - } - return false; + return "US".equals(countryCode) // USA + || "LR".equals(countryCode) // Liberia + || "MM".equals(countryCode); // Burma } public static boolean isLiveMap() { -- cgit v1.1