tiny post-treatment

Author: MenoData

core/src/main/java/net/time4j/PrettyTime.java

@@ -88,10 +88,14 @@ public final class PrettyTime {
 
     static {
         NumberSymbolProvider p = null;
+        int count = 0;
 
         for (NumberSymbolProvider tmp : ResourceLoader.getInstance().services(NumberSymbolProvider.class)) {
-            p = tmp;
-            break;
+            int size = tmp.getAvailableLocales().length;
+            if (size >= count) { // includes SymbolProviderSPI if available
+                p = tmp;
+                count = size;
+            }
         }
 
         if (p == null) {

i18n/src/main/java/net/time4j/format/expert/AttributeSet.java

@@ -64,12 +64,10 @@ final class AttributeSet
         int count = 0;
 
         for (NumberSymbolProvider tmp : ResourceLoader.getInstance().services(NumberSymbolProvider.class)) {
-            if (!tmp.equals(SymbolProviderSPI.INSTANCE)) {
-                int size = tmp.getAvailableLocales().length;
-                if (size > count) {
-                    p = tmp;
-                    count = size;
-                }
+            int size = tmp.getAvailableLocales().length;
+            if (size > count) {
+                p = tmp;
+                count = size;
             }
         }
 

i18n/src/main/java/net/time4j/i18n/SymbolProviderSPI.java

@@ -23,7 +23,6 @@
 
 import net.time4j.format.NumberSymbolProvider;
 
-import java.text.DecimalFormatSymbols;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Locale;
@@ -46,6 +45,8 @@ public final class SymbolProviderSPI
 
     //~ Statische Felder/Initialisierungen --------------------------------
 
+    private static final Locale[] EMPTY_ARRAY = new Locale[0];
+
     public static final Set<String> SUPPORTED_LOCALES;
     public static final SymbolProviderSPI INSTANCE;
 
@@ -79,30 +80,7 @@ public SymbolProviderSPI() {
     @Override
     public Locale[] getAvailableLocales() {
 
-        Set<String> set = new HashSet<>(SUPPORTED_LOCALES);
-
-        for (Locale loc : DecimalFormatSymbols.getAvailableLocales()) {
-            if (loc.getCountry().isEmpty()) {
-                set.add(loc.getLanguage());
-            } else {
-                set.add(loc.getLanguage() + "_" + loc.getCountry());
-            }
-        }
-
-        Locale[] result = new Locale[set.size()];
-        int i = 0;
-
-        for (String s : set) {
-            int underscore = s.indexOf('_');
-            if (underscore == -1) {
-                result[i] = new Locale(s);
-            } else {
-                result[i] = new Locale(s.substring(0, underscore), s.substring(underscore + 1));
-            }
-            i++;
-        }
-
-        return result;
+        return EMPTY_ARRAY; // ok because this class only serves as fallback in SPI-mechanism
 
     }