eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 06:17:27 +00:00
Code Activity

Merge remote-tracking branch 'origin/design2015' into design2015-mobile

Browse Source
This commit is contained in:
Steffen Schaefer committed 2015-07-06 13:55:21 +02:00
2 parents 1f1930bb0f 416f1cd155
commit fadec89e61
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/FlagImageResolver.java
+4 -4
View File
@@ -292,12 +292,12 @@ public class FlagImageResolver {
return flagImagesMap.get(NONE);
}
public static SafeUri getFlagImageResource(String flagImageUrl, String twoLetterIsoCountryCode) {
public static SafeUri getFlagImageUri(String flagImageUrl, String twoLetterIsoCountryCode) {
if (flagImageUrl == null || flagImageUrl.isEmpty()) {
if (twoLetterIsoCountryCode == null || twoLetterIsoCountryCode.isEmpty()) {
return FlagImageResolver.getEmptyFlagImageResource().getSafeUri();
if (twoLetterIsoCountryCode == null || twoLetterIsoCountryCode.isEmpty() || getFlagImageResource(twoLetterIsoCountryCode) == null) {
return getEmptyFlagImageResource().getSafeUri();
}
return FlagImageResolver.getFlagImageResource(twoLetterIsoCountryCode).getSafeUri();
return getFlagImageResource(twoLetterIsoCountryCode).getSafeUri();
}
return UriUtils.fromTrustedString(flagImageUrl);
}