Projects >> cgeo >>d11b31de283d3feea2721786a0d4643b91be5cf7

Chunk
Conflicting content
    final private List list;
    private boolean cachedDistances;

<<<<<<< HEAD
=======
    final static public DistanceComparator singleton = new DistanceComparator();

    public DistanceComparator() {
        // This constructor should not be used as a comparator as distances will not be updated.
        // It is needed in order to really know we are sorting by Distances in the sort menu.
        // If you need it for sorting, please use the second constructor.
        coords = null;
        list = new ArrayList<>();
    }

>>>>>>> 5f15e55d7dcb9649b96c3e1790a46b1f52cbbc31
    public DistanceComparator(final Geopoint coords, final List list) {
        this.coords = coords;
        // create new list so we can iterate over the list in parallel with the cache list adapter
Solution content
    final private List list;
    private boolean cachedDistances;

    final static public DistanceComparator singleton = new DistanceComparator();

    public DistanceComparator() {
        // This constructor should not be used as a comparator as distances will not be updated.
        // It is needed in order to really know we are sorting by Distances in the sort menu.
        // If you need it for sorting, please use the second constructor.
        coords = null;
        list = new ArrayList<>();
    }

    public DistanceComparator(final Geopoint coords, final List list) {
        this.coords = coords;
        // create new list so we can iterate over the list in parallel with the cache list adapter
File
DistanceComparator.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method declaration
Method invocation