From fb1e51c2d316b22dea816abb0c2405447ed1ff64 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Thu, 4 Jun 2015 09:59:50 +0200 Subject: [PATCH] RCApp: fixed LINT locale errors --- .../racecommittee/app/domain/impl/MapMarkerImpl.java | 5 +++-- .../racecommittee/app/ui/adapters/AbortFlagsAdapter.java | 9 +++++---- .../racecommittee/app/ui/adapters/CourseNameAdapter.java | 3 ++- .../app/ui/fragments/raceinfo/MainScheduleFragment.java | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java index 9f68f7c2ce3..9508a68eec3 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/MapMarkerImpl.java @@ -1,6 +1,7 @@ package com.sap.sailing.racecommittee.app.domain.impl; import java.util.ArrayList; +import java.util.Locale; import java.util.UUID; import android.content.Context; @@ -62,7 +63,7 @@ public class MapMarkerImpl implements MapMarker { @Override public Color getColor(Context context) { - String name = this.name.toLowerCase(context.getResources().getConfiguration().locale); + String name = this.name.toLowerCase(Locale.US); if (name.startsWith("white")) { return Color.WHITE; } else if (name.startsWith("gray")) { @@ -99,7 +100,7 @@ public class MapMarkerImpl implements MapMarker { @Override public BitmapDescriptor getMarkerIcon(Context context) { - String name = this.name.toLowerCase(context.getResources().getConfiguration().locale); + String name = this.name.toLowerCase(Locale.US); // buoys if (name.startsWith("white")) { return BitmapDescriptorFactory.fromResource(R.drawable.buoy_white_grey); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/AbortFlagsAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/AbortFlagsAdapter.java index daa89411320..9bc8cf68f13 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/AbortFlagsAdapter.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/AbortFlagsAdapter.java @@ -16,6 +16,7 @@ import com.sap.sailing.racecommittee.app.R; import com.sap.sailing.racecommittee.app.utils.BitmapHelper; import java.util.ArrayList; +import java.util.Locale; public class AbortFlagsAdapter extends BaseFlagsAdapter { @@ -35,9 +36,9 @@ public class AbortFlagsAdapter extends BaseFlagsAdapter { mListener = listener; mFlags = new ArrayList<>(); - addFlag(flags.name().toLowerCase(), Flags.NONE); - addFlag(flags.name().toLowerCase(), Flags.HOTEL); - addFlag(flags.name().toLowerCase(), Flags.ALPHA); + addFlag(flags.name().toLowerCase(Locale.US), Flags.NONE); + addFlag(flags.name().toLowerCase(Locale.US), Flags.HOTEL); + addFlag(flags.name().toLowerCase(Locale.US), Flags.ALPHA); } private void addFlag(String primaryFlag, Flags otherFlag) { @@ -48,7 +49,7 @@ public class AbortFlagsAdapter extends BaseFlagsAdapter { String secondFlag = ""; if (otherFlag != Flags.NONE) { - secondFlag = "_" + otherFlag.name().toLowerCase(); + secondFlag = "_" + otherFlag.name().toLowerCase(Locale.US); } flagNameId = mContext.getResources().getIdentifier("string/flag_" + primaryFlag + secondFlag, null, mContext.getPackageName()); diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/CourseNameAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/CourseNameAdapter.java index 01d46af3a16..33ec65a155a 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/CourseNameAdapter.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/CourseNameAdapter.java @@ -16,6 +16,7 @@ import com.sap.sailing.racecommittee.app.utils.BitmapHelper; import java.util.Collections; import java.util.List; +import java.util.Locale; public class CourseNameAdapter extends BaseAdapter implements View.OnClickListener { @@ -67,7 +68,7 @@ public class CourseNameAdapter extends BaseAdapter implements View.OnClickListen ImageView flag = ViewHolder.get(convertView, R.id.flag); if (flag != null) { int resId; - if (courseName.toLowerCase().startsWith("i")) { + if (courseName.toLowerCase(Locale.US).startsWith("i")) { resId = R.attr.course_updown_48dp; } else { resId = R.attr.course_triangle_48dp; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java index c3daf57b4fd..2ea1e884578 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java @@ -26,6 +26,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; public class MainScheduleFragment extends BaseFragment implements View.OnClickListener { @@ -125,7 +126,7 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi mCourseTextView.setText(courseName); if (mCourseImageView != null && !TextUtils.isEmpty(courseName)) { - int resId = (courseName.toLowerCase().startsWith("i")) ? R.attr.course_updown_48dp : R.attr.course_triangle_48dp; + int resId = (courseName.toLowerCase(Locale.US).startsWith("i")) ? R.attr.course_updown_48dp : R.attr.course_triangle_48dp; Drawable drawable = BitmapHelper.getAttrDrawable(getActivity(), resId); if (drawable != null) { mCourseImageView.setImageDrawable(drawable);