Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use compareTo() method to sort List<PoiUIFilter>

Browse source
This commit is contained in:
Roman Inflianskas 2016-04-22 11:37:25 +03:00
parent 0048fb82c5
commit b1875f8287
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
View file

@ -148,7 +148,7 @@ public class PoiFiltersHelper {
PoiUIFilter lf = new PoiUIFilter(tp, application, ""); PoiUIFilter lf = new PoiUIFilter(tp, application, "");
ArrayList<PoiUIFilter> copy = new ArrayList<PoiUIFilter>(cacheTopStandardFilters); ArrayList<PoiUIFilter> copy = new ArrayList<PoiUIFilter>(cacheTopStandardFilters);
copy.add(lf); copy.add(lf);
sortListOfFilters(copy); Collections.sort(copy);
cacheTopStandardFilters = copy; cacheTopStandardFilters = copy;
return lf; return lf;
} }
@ -157,7 +157,7 @@ public class PoiFiltersHelper {
PoiUIFilter lf = new PoiUIFilter(lt, application, ""); PoiUIFilter lf = new PoiUIFilter(lt, application, "");
ArrayList<PoiUIFilter> copy = new ArrayList<PoiUIFilter>(cacheTopStandardFilters); ArrayList<PoiUIFilter> copy = new ArrayList<PoiUIFilter>(cacheTopStandardFilters);
copy.add(lf); copy.add(lf);
sortListOfFilters(copy); Collections.sort(copy);
cacheTopStandardFilters = copy; cacheTopStandardFilters = copy;
return lf; return lf;
} }
@ -183,18 +183,6 @@ public class PoiFiltersHelper {
return userDefinedFilters; return userDefinedFilters;
} }
public void sortListOfFilters(List<PoiUIFilter> list) {
final Collator instance = Collator.getInstance();
Collections.sort(list, new Comparator<PoiUIFilter>() {
@Override
public int compare(PoiUIFilter lhs, PoiUIFilter rhs) {
return instance.compare(lhs.getName(), rhs.getName());
}
});
}
public List<PoiUIFilter> getTopDefinedPoiFilters() { public List<PoiUIFilter> getTopDefinedPoiFilters() {
if (cacheTopStandardFilters == null) { if (cacheTopStandardFilters == null) {
List<PoiUIFilter> top = new ArrayList<PoiUIFilter>(); List<PoiUIFilter> top = new ArrayList<PoiUIFilter>();
@ -209,7 +197,7 @@ public class PoiFiltersHelper {
PoiUIFilter f = new PoiUIFilter(t, application, ""); PoiUIFilter f = new PoiUIFilter(t, application, "");
top.add(f); top.add(f);
} }
sortListOfFilters(top); Collections.sort(top);
cacheTopStandardFilters = top; cacheTopStandardFilters = top;
} }
List<PoiUIFilter> result = new ArrayList<PoiUIFilter>(); List<PoiUIFilter> result = new ArrayList<PoiUIFilter>();
@ -261,7 +249,7 @@ public class PoiFiltersHelper {
if(res){ if(res){
ArrayList<PoiUIFilter> copy = new ArrayList<>(cacheTopStandardFilters); ArrayList<PoiUIFilter> copy = new ArrayList<>(cacheTopStandardFilters);
copy.add(filter); copy.add(filter);
sortListOfFilters(copy); Collections.sort(copy);
cacheTopStandardFilters = copy; cacheTopStandardFilters = copy;
} }
helper.close(); helper.close();