Index: applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java	(revision 30701)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java	(revision 30737)
@@ -1,13 +1,21 @@
 package nanolog;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.gpx.*;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.tools.Geometry;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.date.PrimaryDateParser;
 
@@ -24,5 +32,5 @@
      */
     public static long crudeMatch( List<NanoLogEntry> entries, GpxData data ) {
-        List<NanoLogEntry> sortedEntries = new ArrayList<NanoLogEntry>(entries);
+        List<NanoLogEntry> sortedEntries = new ArrayList<>(entries);
         PrimaryDateParser dateParser = new PrimaryDateParser();
         Collections.sort(sortedEntries);
@@ -72,5 +80,5 @@
      */
     public static void correlate( List<NanoLogEntry> entries, GpxData data, long offset ) {
-        List<NanoLogEntry> sortedEntries = new ArrayList<NanoLogEntry>(entries);
+        List<NanoLogEntry> sortedEntries = new ArrayList<>(entries);
         //int ret = 0;
         PrimaryDateParser dateParser = new PrimaryDateParser();
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 30701)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 30737)
@@ -1,15 +1,35 @@
 package nanolog;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
-import java.util.regex.*;
-import javax.swing.*;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.*;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -18,7 +38,9 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.dialogs.*;
-import org.openstreetmap.josm.gui.layer.*;
-import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.JumpToMarkerActions;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -32,10 +54,10 @@
     private List<NanoLogEntry> log;
     private int selectedEntry;
-    private final Set<NanoLogLayerListener> listeners = new HashSet<NanoLogLayerListener>();
+    private final Set<NanoLogLayerListener> listeners = new HashSet<>();
     private NLLMouseAdapter mouseListener;
-    
+
     public NanoLogLayer( List<NanoLogEntry> entries ) {
         super(tr("NanoLog"));
-        log = new ArrayList<NanoLogEntry>(entries);
+        log = new ArrayList<>(entries);
         selectedEntry = -1;
         mouseListener = new NLLMouseAdapter();
@@ -50,5 +72,5 @@
         super.destroy();
     }
-    
+
     public NanoLogLayer( File file ) throws IOException {
         this(readNanoLog(file));
@@ -76,9 +98,9 @@
         return Collections.unmodifiableList(log);
     }
-    
+
     public static List<NanoLogEntry> readNanoLog( File file ) throws IOException {
         final Pattern NANOLOG_LINE = Pattern.compile("(.+?)\\t(.+?)(?:\\s*\\{\\{(-?\\d+\\.\\d+),\\s*(-?\\d+\\.\\d+)(?:,\\s*(\\d+))?\\}\\})?");
         final SimpleDateFormat fmt = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss.SS");
-        List<NanoLogEntry> result = new ArrayList<NanoLogEntry>();
+        List<NanoLogEntry> result = new ArrayList<>();
         BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF8"));
         while( r.ready() ) {
@@ -301,5 +323,5 @@
         Main.map.mapView.repaint();
     }
-    
+
     private class CorrelateEntries extends JosmAction {
         private boolean toZero;
@@ -328,5 +350,5 @@
         }
     }
-    
+
     private class SaveLayer extends JosmAction {
 
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 30701)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 30737)
@@ -20,5 +20,5 @@
 /**
  * NanoLog Panel. Displays the selected log item, along with surrounding 30-50 lines.
- * 
+ *
  * @author zverik
  */
@@ -26,15 +26,15 @@
     private JList<String> logPanel;
     private LogListModel listModel;
-    
+
     public NanoLogPanel() {
         super(tr("NanoLog"), "nanolog", tr("Open NanoLog panel"), null, 150, false);
-        
+
         listModel = new LogListModel();
-        logPanel = new JList<String>(listModel);
+        logPanel = new JList<>(listModel);
         createLayout(logPanel, true, null);
     }
 
     public void updateMarkers() {
-        List<NanoLogEntry> entries = new ArrayList<NanoLogEntry>();
+        List<NanoLogEntry> entries = new ArrayList<>();
         for( NanoLogLayer l : Main.map.mapView.getLayersOfType(NanoLogLayer.class) ) {
             entries.addAll(l.getEntries());
@@ -74,14 +74,16 @@
         }
     }
-    
+
     private class LogListModel extends AbstractListModel<String> {
         private List<NanoLogEntry> entries;
         private final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:ss");
 
-        public int getSize() {
+        @Override
+		public int getSize() {
             return entries.size();
         }
 
-        public String getElementAt( int index ) {
+        @Override
+		public String getElementAt( int index ) {
             return TIME_FORMAT.format(entries.get(index).getTime()) + " " + entries.get(index).getMessage();
         }