Index: applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java
===================================================================
--- applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java	(revision 30701)
+++ applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java	(revision 30737)
@@ -10,15 +10,12 @@
 package org.openstreetmap.josm.plugins.infomode;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.AWTEvent;
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.gpx.WayPoint;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.awt.Cursor;
 import java.awt.Graphics2D;
+import java.awt.Point;
 import java.awt.Stroke;
 import java.awt.Toolkit;
@@ -27,6 +24,8 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.swing.Popup;
 import javax.swing.PopupFactory;
@@ -35,6 +34,8 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
 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.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -58,8 +59,8 @@
 
     InfoMode(MapFrame mapFrame) {
-        super(tr("InfoMode"), "infomode.png", tr("GPX info mode"), 
+        super(tr("InfoMode"), "infomode.png", tr("GPX info mode"),
 		Shortcut.registerShortcut("mapmode:infomode", tr("Mode: {0}", tr("GPX info mode")), KeyEvent.VK_BACK_SLASH, Shortcut.DIRECT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         infoPanel=new InfoPanel();
-        
+
     }
 
@@ -105,5 +106,5 @@
         } catch (SecurityException ex) {
         }
-        
+
         repaint();
     }
@@ -122,5 +123,5 @@
         if (pos==null) return;
         Layer curL= Main.main.getActiveLayer();
-        if (curL instanceof GpxLayer) showLayerInfo(g,curL,mv); else {       
+        if (curL instanceof GpxLayer) showLayerInfo(g,curL,mv); else {
             for (Layer l:mv.getAllLayers()) {
                 if (l instanceof GpxLayer) {
@@ -157,5 +158,5 @@
             oldPopup.hide();
             oldPopup=null;        wpOld=null;
-        }        
+        }
         repaint();
     }
@@ -188,5 +189,5 @@
         }
     }
-    
+
 
     /**
@@ -220,8 +221,8 @@
     private synchronized void filterTracks() {
         Layer l = Main.main.getActiveLayer();
-        
+
         if (l instanceof GpxLayer && pos!=null) {
             GpxLayer gpxL = (GpxLayer )l;
-            Set<GpxTrack> toRemove = new HashSet<GpxTrack>();
+            Set<GpxTrack> toRemove = new HashSet<>();
             for (GpxTrack track : gpxL.data.tracks) {
                 boolean f=true;
@@ -234,5 +235,5 @@
             }
             gpxL.data.tracks.removeAll(toRemove);
-                                
+
 
         }
@@ -241,5 +242,5 @@
     private boolean showLayerInfo(Graphics2D g, Layer l, MapView mv) {
             GpxLayer gpxL = (GpxLayer )l;
-            
+
             double minDist=1e9,d;
             WayPoint wp=null,oldWp=null,prevWp=null;
@@ -251,5 +252,5 @@
                     for (WayPoint S : seg.getWayPoints()) {
                         d = S.getEastNorth().distance(pos);
-                        
+
                         if (d<minDist && d<maxD) {
                             minDist = d;
@@ -264,5 +265,5 @@
             if (wp!=null) {
                 Point p = mv.getPoint(wp.getCoor());
-                                
+
                 g.setColor(Color.RED);
                 g.fillOval(p.x-10, p.y-10, 20, 20); // mark selected point
@@ -285,5 +286,5 @@
                 int pcy = s.y+p.y+30;
                 if (shift) {pcx+=40; pcy-=30;}
-                
+
                 if (wp!=wpOld) {
                     if (oldPopup!=null) oldPopup.hide();
@@ -294,5 +295,5 @@
                     }
                     infoPanel.setData(wp,trk,vel,gpxL.data.tracks);
-                    Popup pp=PopupFactory.getSharedInstance().getPopup(mv, infoPanel, 
+                    Popup pp=PopupFactory.getSharedInstance().getPopup(mv, infoPanel,
                             pcx, pcy);
                     pp.show();
Index: applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java
===================================================================
--- applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java	(revision 30701)
+++ applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java	(revision 30737)
@@ -1,29 +1,31 @@
 package org.openstreetmap.josm.plugins.infomode;
 
-import java.awt.event.MouseEvent;
-import java.util.HashSet;
-import java.util.Set;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.text.DateFormat;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
+
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+
 import org.openstreetmap.josm.Main;
 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.GBC;
 import org.openstreetmap.josm.tools.OpenBrowser;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
+class InfoPanel extends JPanel {
 
-class InfoPanel extends JPanel {
-    
     private Collection<GpxTrack> tracks;
     private GpxTrack trk;
@@ -38,8 +40,8 @@
     private JButton but1 = new JButton(tr("Delete this"));
     private JButton but2 = new JButton(tr("Delete this&older"));
-    
+
     public InfoPanel() {
         super(new GridBagLayout());
-        df = DateFormat.getDateTimeInstance(DateFormat.DEFAULT,DateFormat.DEFAULT, Locale.getDefault()); 
+        df = DateFormat.getDateTimeInstance(DateFormat.DEFAULT,DateFormat.DEFAULT, Locale.getDefault());
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         add(label1, GBC.eol().insets(10,0,0,0));
@@ -54,12 +56,16 @@
         label6.addMouseListener(new MouseListener() {
             @Override
-            public void mouseClicked(MouseEvent e) { 
+            public void mouseClicked(MouseEvent e) {
                 String s = label6.getText();
-                OpenBrowser.displayUrl( s.substring(9, s.length()-11) ); 
+                OpenBrowser.displayUrl( s.substring(9, s.length()-11) );
             }
-            public void mousePressed(MouseEvent e) { }
-            public void mouseReleased(MouseEvent e) { }
-            public void mouseEntered(MouseEvent e) { }
-            public void mouseExited(MouseEvent e) { }
+            @Override
+			public void mousePressed(MouseEvent e) { }
+            @Override
+			public void mouseReleased(MouseEvent e) { }
+            @Override
+			public void mouseEntered(MouseEvent e) { }
+            @Override
+			public void mouseExited(MouseEvent e) { }
         });
         but1.addActionListener(new ActionListener() {
@@ -74,6 +80,6 @@
             public void actionPerformed(ActionEvent e) {
             if (tracks==null) return;
-            Set<GpxTrack> toRemove = new HashSet<GpxTrack>();
-            
+            Set<GpxTrack> toRemove = new HashSet<>();
+
             double tm=-1;
             for (GpxTrackSegment seg : trk.getSegments()) {
@@ -82,5 +88,5 @@
                     }
                 }
-            
+
             for (GpxTrack track : tracks) {
                 boolean f=true;
@@ -96,5 +102,5 @@
             }
         });
-        
+
 
     }
@@ -112,5 +118,5 @@
               else label2.setText(null);
         String s = (String) trk.getAttributes().get("name");
-        if (s!=null) label3.setText(tr("Track name: ")+s); 
+        if (s!=null) label3.setText(tr("Track name: ")+s);
                 else label3.setText(null);
         s = (String) trk.getAttributes().get("desc");
@@ -125,4 +131,4 @@
         } else label6.setText(null);
     }
-    
+
 }