mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-08 13:20:57 +00:00
fixed generics warnings by adding type param to NaturalNamedComparator and using consistenly
Change-Id: I69376b70953d0b6b4aeb0cefdeaceabb9dc4321d
This commit is contained in:
1 parent
7916b4af6e
commit
3f34f84b0c
4 files changed
+7
-7
No files matched your search
+2
-2
@@ -5,7 +5,7 @@ import java.util.Comparator;
|
||||
import com.sap.sse.common.Named;
|
||||
import com.sap.sse.common.util.NaturalComparator;
|
||||
|
||||
public class NaturalNamedComparator implements Comparator<Named> {
|
||||
public class NaturalNamedComparator<T extends Named> implements Comparator<T> {
|
||||
|
||||
private Comparator<String> comparator;
|
||||
|
||||
@@ -21,7 +21,7 @@ public class NaturalNamedComparator implements Comparator<Named> {
|
||||
* @return the comparison result (see String.compareTo)
|
||||
*/
|
||||
@Override
|
||||
public int compare(Named left, Named right) {
|
||||
public int compare(T left, T right) {
|
||||
return comparator.compare(left.getName(), right.getName());
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -126,7 +126,7 @@ public abstract class NamedListFragment<T extends Named> extends LoggableListFra
|
||||
//TODO: Quickfix for 2889
|
||||
if (data != null) {
|
||||
namedList.addAll(data);
|
||||
Collections.sort(namedList, new NaturalNamedComparator());
|
||||
Collections.sort(namedList, new NaturalNamedComparator<T>());
|
||||
for (Named named : namedList) {
|
||||
CheckedItem item = new CheckedItem();
|
||||
item.setText(named.getName());
|
||||
|
||||
+1
-1
@@ -331,7 +331,7 @@ public class CourseFragmentMarks extends CourseFragment implements CourseMarkAda
|
||||
private void onLoadMarksSucceeded(Collection<Mark> data) {
|
||||
mMarks.clear();
|
||||
mMarks.addAll(data);
|
||||
Collections.sort(mMarks, new NaturalNamedComparator());
|
||||
Collections.sort(mMarks, new NaturalNamedComparator<Mark>());
|
||||
}
|
||||
|
||||
private void fillCourseElement() {
|
||||
|
||||
+3
-3
@@ -77,8 +77,8 @@ public class TrackingListFragment extends BaseFragment
|
||||
private TextView mPageTitle;
|
||||
private Spinner mSortSpinner;
|
||||
|
||||
private Comparator mComparator;
|
||||
private ArrayList<Comparator> mComparators;
|
||||
private Comparator<Competitor> mComparator;
|
||||
private List<Comparator<Competitor>> mComparators;
|
||||
|
||||
public TrackingListFragment() {
|
||||
mCompetitorData = new ArrayList<>();
|
||||
@@ -163,7 +163,7 @@ public class TrackingListFragment extends BaseFragment
|
||||
|
||||
mComparators = new ArrayList<>();
|
||||
mComparators.add(new CompetitorSailIdComparator());
|
||||
mComparators.add(new NaturalNamedComparator());
|
||||
mComparators.add(new NaturalNamedComparator<Competitor>());
|
||||
|
||||
mFinishedData = initializeFinishList();
|
||||
loadCompetitors();
|
||||
|
||||
Reference in new issue
Block a user