Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 10619)
@@ -119,15 +119,13 @@
 
     protected static void sort(List<ExtensionFileFilter> filters) {
-        Collections.sort(
-                filters,
-                new Comparator<ExtensionFileFilter>() {
-                    private AllFormatsImporter all = new AllFormatsImporter();
-                    @Override
-                    public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) {
-                        if (o1.getDescription().equals(all.filter.getDescription())) return 1;
-                        if (o2.getDescription().equals(all.filter.getDescription())) return -1;
-                        return o1.getDescription().compareTo(o2.getDescription());
-                    }
+        filters.sort(new Comparator<ExtensionFileFilter>() {
+                private AllFormatsImporter all = new AllFormatsImporter();
+                @Override
+                public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) {
+                    if (o1.getDescription().equals(all.filter.getDescription())) return 1;
+                    if (o2.getDescription().equals(all.filter.getDescription())) return -1;
+                    return o1.getDescription().compareTo(o2.getDescription());
                 }
+            }
         );
     }
Index: trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java	(revision 10619)
@@ -130,5 +130,5 @@
             List<Integer> segmentIndexes = new LinkedList<>();
             segmentIndexes.addAll(innerEntry.keySet());
-            Collections.sort(segmentIndexes, Collections.reverseOrder());
+            segmentIndexes.sort(Collections.reverseOrder());
 
             List<Node> wayNodes = w.getNodes();
@@ -149,5 +149,5 @@
                 List<Node> nodesToAdd = new LinkedList<>();
                 nodesToAdd.addAll(nodesInSegment);
-                Collections.sort(nodesToAdd, new NodeDistanceToRefNodeComparator(
+                nodesToAdd.sort(new NodeDistanceToRefNodeComparator(
                         w.getNode(segmentIndex), w.getNode(segmentIndex+1), !joinWayToNode));
                 wayNodes.addAll(segmentIndex + 1, nodesToAdd);
Index: trunk/src/org/openstreetmap/josm/actions/PurgeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PurgeAction.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/actions/PurgeAction.java	(revision 10619)
@@ -13,5 +13,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -244,5 +243,5 @@
                             ImageProvider.get("warning-small"), JLabel.LEFT), GBC.eol().fill(GBC.HORIZONTAL));
 
-            Collections.sort(toPurgeAdditionally, (o1, o2) -> {
+            toPurgeAdditionally.sort((o1, o2) -> {
                 int type = o2.getType().compareTo(o1.getType());
                 if (type != 0)
Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 10619)
@@ -4,5 +4,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -72,7 +71,7 @@
         }
         OsmPrimitiveComparator c = new OsmPrimitiveComparator(false, true);
-        Collections.sort(toDelete, c);
-        Collections.sort(toAdd, c);
-        Collections.sort(toUpdate, c);
+        toDelete.sort(c);
+        toAdd.sort(c);
+        toUpdate.sort(c);
     }
 
@@ -332,8 +331,5 @@
             }
             List<Relation> ret = new ArrayList<>(relations);
-            Collections.sort(
-                    ret,
-                    (o1, o2) -> Integer.compare(uploadOrder.indexOf(o1), uploadOrder.indexOf(o2))
-                    );
+            ret.sort((o1, o2) -> Integer.compare(uploadOrder.indexOf(o1), uploadOrder.indexOf(o2)));
             return ret;
         }
Index: trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 10619)
@@ -102,5 +102,5 @@
     public Collection<Note> getSortedNotes() {
         final List<Note> list = new ArrayList<>(noteList);
-        Collections.sort(list, comparator);
+        list.sort(comparator);
         return list;
     }
Index: trunk/src/org/openstreetmap/josm/data/osm/history/History.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 10619)
@@ -4,5 +4,4 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -69,5 +68,5 @@
     public History sortAscending() {
         List<HistoryOsmPrimitive> copy = new ArrayList<>(versions);
-        Collections.sort(copy, (o1, o2) -> o1.compareTo(o2));
+        copy.sort((o1, o2) -> o1.compareTo(o2));
         return new History(id, type, copy);
     }
@@ -79,5 +78,5 @@
     public History sortDescending() {
         List<HistoryOsmPrimitive> copy = new ArrayList<>(versions);
-        Collections.sort(copy, (o1, o2) -> o2.compareTo(o1));
+        copy.sort((o1, o2) -> o2.compareTo(o1));
         return new History(id, type, copy);
     }
Index: trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 10619)
@@ -11,5 +11,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -150,5 +149,5 @@
         // for each configured ImageryInfo, add a menu entry.
         final List<ImageryInfo> savedLayers = new ArrayList<>(ImageryLayerInfo.instance.getLayers());
-        Collections.sort(savedLayers, alphabeticImageryComparator);
+        savedLayers.sort(alphabeticImageryComparator);
         for (final ImageryInfo u : savedLayers) {
             addDynamic(new AddImageryLayerAction(u));
@@ -184,5 +183,5 @@
             }
             if (!inViewLayers.isEmpty()) {
-                Collections.sort(inViewLayers, alphabeticImageryComparator);
+                inViewLayers.sort(alphabeticImageryComparator);
                 addDynamicSeparator();
                 for (ImageryInfo i : inViewLayers) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 10619)
@@ -5,5 +5,4 @@
 import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -65,13 +64,11 @@
 
     protected void sort() {
-        Collections.sort(
-                displayedKeys,
-                (key1, key2) -> {
-                    if (decisions.get(key1).isDecided() && !decisions.get(key2).isDecided())
-                        return 1;
-                    else if (!decisions.get(key1).isDecided() && decisions.get(key2).isDecided())
-                        return -1;
-                    return key1.compareTo(key2);
-                }
+        displayedKeys.sort((key1, key2) -> {
+                if (decisions.get(key1).isDecided() && !decisions.get(key2).isDecided())
+                    return 1;
+                else if (!decisions.get(key1).isDecided() && decisions.get(key2).isDecided())
+                    return -1;
+                return key1.compareTo(key2);
+            }
         );
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java	(revision 10619)
@@ -14,5 +14,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -202,17 +201,15 @@
 
         protected void sort() {
-            Collections.sort(
-                    data,
-                    new Comparator<RelationToChildReference>() {
-                        private NameFormatter nf = DefaultNameFormatter.getInstance();
-                        @Override
-                        public int compare(RelationToChildReference o1, RelationToChildReference o2) {
-                            int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf));
-                            if (cmp != 0) return cmp;
-                            cmp = o1.getParent().getDisplayName(nf).compareTo(o2.getParent().getDisplayName(nf));
-                            if (cmp != 0) return cmp;
-                            return Integer.compare(o1.getPosition(), o2.getPosition());
-                        }
+            data.sort(new Comparator<RelationToChildReference>() {
+                    private NameFormatter nf = DefaultNameFormatter.getInstance();
+                    @Override
+                    public int compare(RelationToChildReference o1, RelationToChildReference o2) {
+                        int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf));
+                        if (cmp != 0) return cmp;
+                        cmp = o1.getParent().getDisplayName(nf).compareTo(o2.getParent().getDisplayName(nf));
+                        if (cmp != 0) return cmp;
+                        return Integer.compare(o1.getPosition(), o2.getPosition());
                     }
+                }
             );
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(revision 10619)
@@ -10,5 +10,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -107,5 +106,5 @@
     protected static String buildDataText(OsmDataLayer layer, List<OsmPrimitive> primitives) {
         InspectPrimitiveDataText dt = new InspectPrimitiveDataText(layer);
-        Collections.sort(primitives, new OsmPrimitiveComparator());
+        primitives.sort(new OsmPrimitiveComparator());
         for (OsmPrimitive o : primitives) {
             dt.addPrimitive(o);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 10619)
@@ -395,8 +395,5 @@
 
         public void sort() {
-            Collections.sort(
-                    relations,
-                    DefaultNameFormatter.getInstance().getRelationComparator()
-                    );
+            relations.sort(DefaultNameFormatter.getInstance().getRelationComparator());
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 10619)
@@ -657,7 +657,7 @@
          */
         public synchronized void sort() {
-            if (this.selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100000)) {
-                boolean quick = this.selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10000);
-                Collections.sort(this.selection, new OsmPrimitiveComparator(quick, false));
+            if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100000)) {
+                boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10000);
+                selection.sort(new OsmPrimitiveComparator(quick, false));
             }
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java	(revision 10619)
@@ -6,5 +6,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -151,11 +150,9 @@
 
     protected void sort() {
-        Collections.sort(
-                this.data,
-                (o1, o2) -> {
-                    if (o1.getId() < o2.getId()) return 1;
-                    if (o1.getId() == o2.getId()) return 0;
-                    return -1;
-                }
+        data.sort((o1, o2) -> {
+                if (o1.getId() < o2.getId()) return 1;
+                if (o1.getId() == o2.getId()) return 0;
+                return -1;
+            }
         );
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java	(revision 10619)
@@ -3,5 +3,4 @@
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -80,30 +79,28 @@
 
     protected void sort() {
-        Collections.sort(
-                data,
-                (c1, c2) -> {
-                    if (c1.getModificationType().equals(c2.getModificationType())) {
-                        long id1 = c1.getPrimitive().getId();
-                        long id2 = c2.getPrimitive().getId();
+        data.sort((c1, c2) -> {
+                if (c1.getModificationType().equals(c2.getModificationType())) {
+                    long id1 = c1.getPrimitive().getId();
+                    long id2 = c2.getPrimitive().getId();
 
-                        if (id1 == id2)
-                            return 0;
-                        else if (id1 < id2)
-                            return -1;
-                        return 1;
+                    if (id1 == id2)
+                        return 0;
+                    else if (id1 < id2)
+                        return -1;
+                    return 1;
+                }
+                switch(c1.getModificationType()) {
+                case CREATED: return -1;
+                case UPDATED:
+                    switch(c2.getModificationType()) {
+                    case CREATED: return 1;
+                    default: return -1;
                     }
-                    switch(c1.getModificationType()) {
-                    case CREATED: return -1;
-                    case UPDATED:
-                        switch(c2.getModificationType()) {
-                        case CREATED: return 1;
-                        default: return -1;
-                        }
-                    case DELETED:
-                        return 1;
-                    }
-                    // should not happen
-                    return 0;
+                case DELETED:
+                    return 1;
                 }
+                // should not happen
+                return 0;
+            }
         );
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java	(revision 10619)
@@ -4,5 +4,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -140,11 +139,9 @@
 
     protected void sort() {
-        Collections.sort(
-                data,
-                (cs1, cs2) -> {
-                    if (cs1.getId() > cs2.getId()) return -1;
-                    if (cs1.getId() == cs2.getId()) return 0;
-                    return 1;
-                }
+        data.sort((cs1, cs2) -> {
+                if (cs1.getId() > cs2.getId()) return -1;
+                if (cs1.getId() == cs2.getId()) return 0;
+                return 1;
+            }
         );
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 10619)
@@ -702,5 +702,5 @@
 
         List<Relation> sortedRelations = new ArrayList<>(roles.keySet());
-        Collections.sort(sortedRelations, (o1, o2) -> {
+        sortedRelations.sort((o1, o2) -> {
             int comp = Boolean.compare(o1.isDisabledAndHidden(), o2.isDisabledAndHidden());
             return comp != 0 ? comp : DefaultNameFormatter.getInstance().getRelationComparator().compare(o1, o2);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 10619)
@@ -415,5 +415,5 @@
             AutoCompletionManager autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
             List<AutoCompletionListItem> keyList = autocomplete.getKeys();
-            Collections.sort(keyList, defaultACItemComparator);
+            keyList.sort(defaultACItemComparator);
 
             keys = new AutoCompletingComboBox(key);
@@ -428,5 +428,5 @@
 
             List<AutoCompletionListItem> valueList = autocomplete.getValues(getAutocompletionKeys(key));
-            Collections.sort(valueList, usedValuesAwareComparator);
+            valueList.sort(usedValuesAwareComparator);
 
             final String selection = m.size() != 1 ? tr("<different>") : m.entrySet().iterator().next().getKey();
@@ -612,5 +612,5 @@
 
                    List<AutoCompletionListItem> valueList = autocomplete.getValues(getAutocompletionKeys(key));
-                   Collections.sort(valueList, comparator);
+                   valueList.sort(comparator);
                    if (Main.isTraceEnabled()) {
                        Main.trace("Focus gained by {0}, e={1}", values, e);
@@ -687,5 +687,5 @@
             }
 
-            Collections.sort(keyList, defaultACItemComparator);
+            keyList.sort(defaultACItemComparator);
             keys.setPossibleACItems(keyList);
             keys.setEditable(true);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java	(revision 10619)
@@ -4,5 +4,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -65,5 +64,5 @@
         @Override
         public List<RelationMember> sortMembers(List<RelationMember> list) {
-            Collections.sort(list, (a, b) -> {
+            list.sort((a, b) -> {
                 final int houseNumber = AlphanumComparator.getInstance().compare(
                         a.getMember().get("addr:housenumber"),
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java	(revision 10619)
@@ -6,5 +6,4 @@
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
@@ -71,5 +70,5 @@
             layerInfo.add(new SaveLayerInfo(layer));
         }
-        Collections.sort(layerInfo, (o1, o2) -> o1.compareTo(o2));
+        layerInfo.sort((o1, o2) -> o1.compareTo(o2));
         fireTableDataChanged();
     }
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 10619)
@@ -202,16 +202,14 @@
             if (data == null)
                 return;
-            Collections.sort(
-                    data,
-                    new Comparator<OsmPrimitive>() {
-                        private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
-                        @Override
-                        public int compare(OsmPrimitive o1, OsmPrimitive o2) {
-                            int ret = OsmPrimitiveType.from(o1).compareTo(OsmPrimitiveType.from(o2));
-                            if (ret != 0)
-                                return ret;
-                            return o1.getDisplayName(formatter).compareTo(o1.getDisplayName(formatter));
-                        }
+            data.sort(new Comparator<OsmPrimitive>() {
+                    private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
+                    @Override
+                    public int compare(OsmPrimitive o1, OsmPrimitive o2) {
+                        int ret = OsmPrimitiveType.from(o1).compareTo(OsmPrimitiveType.from(o2));
+                        if (ret != 0)
+                            return ret;
+                        return o1.getDisplayName(formatter).compareTo(o1.getDisplayName(formatter));
                     }
+                }
             );
         }
Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 10619)
@@ -1447,5 +1447,5 @@
                 return;
             List<Tile> allTiles = allTilesCreate();
-            Collections.sort(allTiles, getTileDistanceComparator());
+            allTiles.sort(getTileDistanceComparator());
             for (Tile t : allTiles) {
                 loadTile(t, force);
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 10619)
@@ -646,5 +646,5 @@
          */
         final List<Way> sortedWays = new ArrayList<>(ways);
-        Collections.sort(sortedWays, new OsmPrimitiveComparator(true, false)); // sort by OsmPrimitive#getUniqueId ascending
+        sortedWays.sort(new OsmPrimitiveComparator(true, false)); // sort by OsmPrimitive#getUniqueId ascending
         Collections.reverse(sortedWays); // sort by OsmPrimitive#getUniqueId descending
         for (Way w : sortedWays) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 10619)
@@ -1081,5 +1081,5 @@
         }
 
-        Collections.sort(dateImgLst, (o1, o2) -> o1.getExifTime().compareTo(o2.getExifTime()));
+        dateImgLst.sort((o1, o2) -> o1.getExifTime().compareTo(o2.getExifTime()));
 
         return dateImgLst;
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 10619)
@@ -11,5 +11,4 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 import javax.swing.AbstractAction;
@@ -278,5 +277,5 @@
         /* we must have got at least one waypoint now */
 
-        Collections.sort((ArrayList<WayPoint>) waypoints, (a, b) -> a.time <= b.time ? -1 : 1);
+        ((ArrayList<WayPoint>) waypoints).sort((a, b) -> a.time <= b.time ? -1 : 1);
 
         firstTime = -1.0; /* this time of the first waypoint, not first trackpoint */
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 10619)
@@ -19,5 +19,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
@@ -234,5 +233,5 @@
         if (from instanceof MarkerLayer) {
             data.addAll(((MarkerLayer) from).data);
-            Collections.sort(data, (o1, o2) -> Double.compare(o1.time, o2.time));
+            data.sort((o1, o2) -> Double.compare(o1.time, o2.time));
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 10619)
@@ -1223,12 +1223,11 @@
 
         protected void sort() {
-            Collections.sort(data,
-                    (o1, o2) -> {
-                        if (o1.isEmpty() && o2.isEmpty())
-                            return 0;
-                        if (o1.isEmpty()) return 1;
-                        if (o2.isEmpty()) return -1;
-                        return o1.compareTo(o2);
-                    });
+            data.sort((o1, o2) -> {
+                    if (o1.isEmpty() && o2.isEmpty())
+                        return 0;
+                    if (o1.isEmpty()) return 1;
+                    if (o2.isEmpty()) return -1;
+                    return o1.compareTo(o2);
+                });
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java	(revision 10619)
@@ -274,5 +274,5 @@
         readPreferences(tmpPrefs);
         // sorting after modification - first modified, then non-default, then default entries
-        Collections.sort(allData, customComparator);
+        allData.sort(customComparator);
         applyFilter();
     }
@@ -418,5 +418,5 @@
             }
             // allow user to review the changes in table
-            Collections.sort(allData, customComparator);
+            allData.sort(customComparator);
             applyFilter();
         }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java	(revision 10619)
@@ -7,5 +7,4 @@
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -105,5 +104,5 @@
             sortedStats.add(new Pair<>(e.getKey(), e.getValue()[0]));
         }
-        Collections.sort(sortedStats, (o1, o2) -> -1 * o1.b.compareTo(o2.b));
+        sortedStats.sort((o1, o2) -> -1 * o1.b.compareTo(o2.b));
         String[][] ret = new String[sortedStats.size()][3];
         int index = 0;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 10619)
@@ -5,5 +5,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -147,11 +146,9 @@
      */
     protected void sort() {
-        Collections.sort(
-                availablePlugins,
-                (o1, o2) -> {
-                    String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase(Locale.ENGLISH);
-                    String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase(Locale.ENGLISH);
-                    return n1.compareTo(n2);
-                }
+        availablePlugins.sort((o1, o2) -> {
+                String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase(Locale.ENGLISH);
+                String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase(Locale.ENGLISH);
+                return n1.compareTo(n2);
+            }
         );
     }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java	(revision 10619)
@@ -59,5 +59,5 @@
             this.listener = listener;
             data = new ArrayList<>(Projections.getAllProjectionCodes());
-            Collections.sort(data, new CodeComparator());
+            data.sort(new CodeComparator());
             filteredData = new ArrayList<>(data);
             build();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 10619)
@@ -8,5 +8,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -562,5 +561,5 @@
      */
     protected void sort() {
-        Collections.sort(tags, (self, other) -> self.getName().compareTo(other.getName()));
+        tags.sort((self, other) -> self.getName().compareTo(other.getName()));
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetMenu.java	(revision 10619)
@@ -11,5 +11,4 @@
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -140,5 +139,5 @@
 
     private static void handleMenuItem(JMenu menu, PresetTextComparator comp, List<JMenuItem> sortarray, int lastSeparator) {
-        Collections.sort(sortarray, comp);
+        sortarray.sort(comp);
         int pos = 0;
         for (JMenuItem menuItem : sortarray) {
Index: trunk/src/org/openstreetmap/josm/io/OsmWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmWriter.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/io/OsmWriter.java	(revision 10619)
@@ -7,5 +7,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -110,5 +109,5 @@
         List<T> result = new ArrayList<>(primitives.size());
         result.addAll(primitives);
-        Collections.sort(result, byIdComparator);
+        result.sort(byIdComparator);
         return result;
     }
@@ -269,5 +268,5 @@
             }
             List<Entry<String, String>> entries = new ArrayList<>(osm.getKeys().entrySet());
-            Collections.sort(entries, byKeyComparator);
+            entries.sort(byKeyComparator);
             for (Entry<String, String> e : entries) {
                 out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 10618)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 10619)
@@ -746,11 +746,9 @@
             // lower the value of "stage" the earlier the plugin should be loaded.
             //
-            Collections.sort(
-                    toLoad,
-                    (o1, o2) -> {
-                        if (o1.stage < o2.stage) return -1;
-                        if (o1.stage == o2.stage) return 0;
-                        return 1;
-                    }
+            toLoad.sort((o1, o2) -> {
+                    if (o1.stage < o2.stage) return -1;
+                    if (o1.stage == o2.stage) return 0;
+                    return 1;
+                }
             );
             if (toLoad.isEmpty())