Index: trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 14210)
+++ trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 14211)
@@ -292,29 +292,25 @@
         if (commands.isEmpty())
             return;
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override
-            public void run() {
-                DataSet ds = OsmDataManager.getInstance().getEditDataSet();
-                if (ds != null) {
-                    ds.beginUpdate();
-                }
-                try {
-                    for (int i = 1; i <= num; ++i) {
-                        final Command c = commands.removeLast();
-                        c.undoCommand();
-                        redoCommands.addFirst(c);
-                        fireEvent(new CommandUndoneEvent(UndoRedoHandler.this, c));
-                        if (commands.isEmpty()) {
-                            break;
-                        }
-                    }
-                } finally {
-                    if (ds != null) {
-                        ds.endUpdate();
+        GuiHelper.runInEDTAndWait(() -> {
+            DataSet ds = OsmDataManager.getInstance().getEditDataSet();
+            if (ds != null) {
+                ds.beginUpdate();
+            }
+            try {
+                for (int i = 1; i <= num; ++i) {
+                    final Command c = commands.removeLast();
+                    c.undoCommand();
+                    redoCommands.addFirst(c);
+                    fireEvent(new CommandUndoneEvent(UndoRedoHandler.this, c));
+                    if (commands.isEmpty()) {
+                        break;
                     }
                 }
-                fireCommandsChanged();
+            } finally {
+                if (ds != null) {
+                    ds.endUpdate();
+                }
             }
-
+            fireCommandsChanged();
         });
     }
Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java	(revision 14210)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java	(revision 14211)
@@ -3,5 +3,4 @@
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -60,11 +59,8 @@
             //sort segments by first waypoint
             if (!segs.isEmpty()) {
-                segs.sort(new Comparator<List<WayPoint>>() {
-                    @Override
-                    public int compare(List<WayPoint> o1, List<WayPoint> o2) {
-                        if (o1.isEmpty() || o2.isEmpty())
-                            return 0;
-                        return Double.compare(o1.get(0).time, o2.get(0).time);
-                    }
+                segs.sort((o1, o2) -> {
+                    if (o1.isEmpty() || o2.isEmpty())
+                        return 0;
+                    return Double.compare(o1.get(0).time, o2.get(0).time);
                 });
                 trks.add(segs);
@@ -72,12 +68,9 @@
         }
         //sort tracks by first waypoint of first segment
-        trks.sort(new Comparator<List<List<WayPoint>>>() {
-            @Override
-            public int compare(List<List<WayPoint>> o1, List<List<WayPoint>> o2) {
-                if (o1.isEmpty() || o1.get(0).isEmpty()
-                 || o2.isEmpty() || o2.get(0).isEmpty())
-                    return 0;
-                return Double.compare(o1.get(0).get(0).time, o2.get(0).get(0).time);
-            }
+        trks.sort((o1, o2) -> {
+            if (o1.isEmpty() || o1.get(0).isEmpty()
+             || o2.isEmpty() || o2.get(0).isEmpty())
+                return 0;
+            return Double.compare(o1.get(0).get(0).time, o2.get(0).get(0).time);
         });