From aee870497a4c8b8a972ee5356bf2a5934b013445 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 5 Sep 2014 13:03:54 +0200 Subject: [PATCH] Use stream API --- .../io/bitsquare/gui/util/BSFormatter.java | 64 ++++--------------- 1 file changed, 12 insertions(+), 52 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/src/main/java/io/bitsquare/gui/util/BSFormatter.java index 3e4099b6d2..0b496f13e0 100644 --- a/src/main/java/io/bitsquare/gui/util/BSFormatter.java +++ b/src/main/java/io/bitsquare/gui/util/BSFormatter.java @@ -35,6 +35,7 @@ import java.util.Currency; import java.util.Date; import java.util.List; import java.util.Locale; +import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -252,71 +253,30 @@ public class BSFormatter { public static String countryLocalesToString(List countries) { - String result = ""; - int i = 0; - for (Country country : countries) { - result += country.getName(); - i++; - if (i < countries.size()) { - result += ", "; - } - } - return result; + return countries.stream().map(e -> e.getName()).collect(Collectors.joining(", ")); } public static String arbitratorsToString(List arbitrators) { - String result = ""; - int i = 0; - for (Arbitrator arbitrator : arbitrators) { - result += arbitrator.getName(); - i++; - if (i < arbitrators.size()) { - result += ", "; - } - } - return result; + return arbitrators.stream().map(e -> e.getName()).collect(Collectors.joining(", ")); } public static String languageLocalesToString(List languageLocales) { - String result = ""; - int i = 0; - for (Locale locale : languageLocales) { - result += locale.getDisplayLanguage(); - i++; - if (i < languageLocales.size()) { - result += ", "; - } - } - return result; + return languageLocales.stream().map(e -> e.getDisplayLanguage()).collect(Collectors.joining(", ")); } - public static String arbitrationMethodsToString(List items) { - String result = ""; - int i = 0; - for (Arbitrator.METHOD item : items) { - result += BSResources.get(item.toString()); - i++; - if (i < items.size()) { - result += ", "; - } - } - return result; + public static String arbitrationMethodsToString(List methods) { + return methods.stream().map(e -> BSResources.get(e.toString())).collect(Collectors.joining(", ")); } - public static String arbitrationIDVerificationsToString(List items) { - String result = ""; - int i = 0; - for (Arbitrator.ID_VERIFICATION item : items) { - result += BSResources.get(item.toString()); - i++; - if (i < items.size()) { - result += ", "; - } - } - return result; + return items.stream().map(e -> BSResources.get(e.toString())).collect(Collectors.joining(", ")); } + public static String mnemonicCodeToString(List mnemonicCode) { + return mnemonicCode.stream().collect(Collectors.joining(" ")); + } + + public static String formatDateTime(Date date) { DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, locale); DateFormat timeFormatter = DateFormat.getTimeInstance(DateFormat.DEFAULT, locale);