Changeset 16953 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2020-08-29T07:53:11+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
r16942 r16953 8 8 import java.util.Collection; 9 9 import java.util.Collections; 10 import java.util.Comparator; 10 11 import java.util.Date; 11 12 import java.util.HashMap; … … 374 375 } 375 376 } 376 segSpans.sort( (o1, o2) -> o1.firstTime.compareTo(o2.firstTime));377 segSpans.sort(Comparator.comparing(o -> o.firstTime)); 377 378 } 378 379 return segSpans; -
trunk/src/org/openstreetmap/josm/data/notes/Note.java
r12540 r16953 51 51 52 52 /** Sorts notes strictly by creation date */ 53 public static final Comparator<Note> DATE_COMPARATOR = (n1, n2) -> n1.createdAt.compareTo(n2.createdAt);53 public static final Comparator<Note> DATE_COMPARATOR = Comparator.comparing(n -> n.createdAt); 54 54 55 55 /** Sorts notes by user, then creation date */ -
trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java
r12540 r16953 41 41 42 42 /** Sorts note comments strictly by creation date */ 43 public static final Comparator<NoteComment> DATE_COMPARATOR = (n1, n2) -> n1.commentTimestamp.compareTo(n2.commentTimestamp);43 public static final Comparator<NoteComment> DATE_COMPARATOR = Comparator.comparing(n -> n.commentTimestamp); 44 44 45 45 /** -
trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
r16952 r16953 225 225 } 226 226 227 private final Comparator<INode> nodeComparator = (n1, n2) -> format(n1).compareTo(format(n2));227 private final Comparator<INode> nodeComparator = Comparator.comparing(this::format); 228 228 229 229 @Override … … 315 315 } 316 316 317 private final Comparator<IWay<?>> wayComparator = (w1, w2) -> format(w1).compareTo(format(w2));317 private final Comparator<IWay<?>> wayComparator = Comparator.comparing(this::format); 318 318 319 319 @Override -
trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
r16138 r16953 100 100 */ 101 101 public static final Comparator<ImageryInfo> alphabeticImageryComparator = 102 (ii1, ii2) -> ii1.getName().toLowerCase(Locale.ENGLISH).compareTo(ii2.getName().toLowerCase(Locale.ENGLISH));102 Comparator.comparing(ii -> ii.getName().toLowerCase(Locale.ENGLISH)); 103 103 104 104 private final transient Action offsetAction = new AdjustImageryOffsetAction(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
r16643 r16953 6 6 import java.util.Collection; 7 7 import java.util.Collections; 8 import java.util.Comparator; 8 9 import java.util.HashMap; 9 10 import java.util.LinkedHashSet; … … 288 289 return new TreeSet<>(); 289 290 } else if ("Integer".equals(sort)) { 290 return new TreeSet<>( (String v1, String v2) -> Long.valueOf(v1).compareTo(Long.valueOf(v2)));291 return new TreeSet<>(Comparator.comparing(Long::valueOf)); 291 292 } else { 292 293 return new LinkedHashSet<>(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
r16436 r16953 4 4 import java.util.ArrayList; 5 5 import java.util.Arrays; 6 import java.util.Comparator; 6 7 import java.util.Iterator; 7 8 import java.util.List; … … 94 95 */ 95 96 protected void sort() { 96 data.sort((c1, c2) -> { 97 int d = c1.getModificationType().compareTo(c2.getModificationType()); 98 if (d == 0) { 99 d = Long.compare(c1.getPrimitive().getId(), c2.getPrimitive().getId()); 100 } 101 return d; 102 } 97 data.sort(Comparator.comparing(ChangesetContentEntry::getModificationType).thenComparingLong(c -> c.getPrimitive().getId()) 103 98 ); 104 99 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
r16438 r16953 273 273 274 274 // we must have got at least one waypoint now 275 ((ArrayList<WayPoint>) waypoints).sort( (wp, other) -> wp.compareTo(other));275 ((ArrayList<WayPoint>) waypoints).sort(Comparator.naturalOrder()); 276 276 277 277 firstTime = -1.0; // this time of the first waypoint, not first trackpoint -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java
r16913 r16953 5 5 6 6 import java.awt.GridBagLayout; 7 import java.util.Comparator; 7 8 import java.util.List; 8 9 import java.util.Map; … … 106 107 107 108 private static List<String[]> getHeadersAsVector(Map<String, String> headers) { 108 return headers.entrySet().stream().sorted( (e1, e2) -> e1.getKey().compareTo(e2.getKey()))109 return headers.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getKey)) 109 110 .map(e -> new String[] {e.getKey(), e.getValue()}).collect(Collectors.toList()); 110 111 } -
trunk/src/org/openstreetmap/josm/io/GpxWriter.java
r16643 r16953 11 11 import java.util.ArrayList; 12 12 import java.util.Collection; 13 import java.util.Comparator; 13 14 import java.util.Date; 14 15 import java.util.List; … … 97 98 data.getLayerPrefs().entrySet() 98 99 .stream() 99 .sorted( (e1, e2) -> e1.getKey().compareTo(e2.getKey()))100 .sorted(Comparator.comparing(Map.Entry::getKey)) 100 101 .forEach(entry -> { 101 102 GpxExtension e = layerExts.add("josm", "entry"); -
trunk/src/org/openstreetmap/josm/io/OsmWriter.java
r16663 r16953 320 320 } 321 321 322 protected static final Comparator<Entry<String, String>> byKeyComparator = (o1, o2) -> o1.getKey().compareTo(o2.getKey());322 protected static final Comparator<Entry<String, String>> byKeyComparator = Comparator.comparing(Entry::getKey); 323 323 324 324 protected void addTags(Tagged osm, String tagname, boolean tagOpen) {
Note:
See TracChangeset
for help on using the changeset viewer.