From fd1b154a3c9ae6b1378aed29c9e5f07b3505afe0 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 24 Oct 2019 21:42:25 +0200 Subject: [PATCH] Simplify a bit a function Credit goes to eharris@ --- .../java/org/airsonic/player/util/StringUtil.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java index 9114d484..df7db5ff 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java @@ -266,17 +266,11 @@ public final class StringUtil { return null; } - String[] elements = s.split("_"); - switch (elements.length) { - case 0: - return new Locale(s, "", ""); - case 1: - return new Locale(elements[0], "", ""); - case 2: - return new Locale(elements[0], elements[1], ""); - default: - return new Locale(elements[0], elements[1], elements[2]); + List elements = new ArrayList<>(Arrays.asList(s.split("_", 3))); + while (elements.size() < 3) { + elements.add(""); } + return new Locale(elements.get(0), elements.get(1), elements.get(2)); } /**