Index: applications/editors/josm/plugins/livegps/nbproject/project.xml
===================================================================
--- applications/editors/josm/plugins/livegps/nbproject/project.xml	(revision 29769)
+++ applications/editors/josm/plugins/livegps/nbproject/project.xml	(revision 29769)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ant.freeform</type>
+    <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>livegps</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
+            <name>livegps</name>
+            <properties/>
+            <folders>
+                <source-folder>
+                    <label>src</label>
+                    <type>java</type>
+                    <location>src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>livegps</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+            </folders>
+            <ide-actions>
+                <action name="build">
+                    <target>compile</target>
+                </action>
+                <action name="clean">
+                    <target>clean</target>
+                </action>
+                <action name="run">
+                    <target>install</target>
+                </action>
+                <action name="rebuild">
+                    <target>clean</target>
+                    <target>compile</target>
+                </action>
+            </ide-actions>
+            <view>
+                <items>
+                    <source-folder style="packages">
+                        <label>src</label>
+                        <location>src</location>
+                    </source-folder>
+                    <source-file>
+                        <location>build.xml</location>
+                    </source-file>
+                </items>
+                <context-menu>
+                    <ide-action name="build"/>
+                    <ide-action name="rebuild"/>
+                    <ide-action name="clean"/>
+                    <ide-action name="run"/>
+                </context-menu>
+            </view>
+        </general-data>
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
+            <compilation-unit>
+                <package-root>src</package-root>
+                <classpath mode="compile">../../core/src</classpath>
+                <source-level>1.6</source-level>
+            </compilation-unit>
+        </java-data>
+    </configuration>
+</project>
Index: applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java	(revision 29435)
+++ applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java	(revision 29769)
@@ -19,8 +19,10 @@
     private double length;
 
+    @Override
     public Bounds getBounds() {
         return bounds;
     }
 
+    @Override
     public Collection<WayPoint> getWayPoints() {
         return new CopyList<WayPoint>(wayPoints, size);
@@ -51,4 +53,5 @@
     }
 
+    @Override
     public double length() {
         return length;
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java	(revision 29435)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java	(revision 29769)
@@ -3,5 +3,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.lang.Float;
 
 import java.beans.PropertyChangeEvent;
@@ -16,5 +15,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
 
 import org.json.JSONObject;
@@ -118,4 +116,5 @@
     }
 
+    @Override
     public void run() {
         LiveGpsData oldGpsData = null;
@@ -133,5 +132,5 @@
                         Thread.sleep(1000);
                     } catch (InterruptedException ignore) {}
-		};
+		}
 	    }
 
@@ -167,5 +166,5 @@
                 try {
                     Thread.sleep(1000);
-                } catch (InterruptedException ignore) {} ;
+                } catch (InterruptedException ignore) {} 
                 // send warning to layer
             }
@@ -235,5 +234,5 @@
                 Watch.put("enable", true);
                 Watch.put("json", true);
-            } catch (JSONException je) {};
+            } catch (JSONException je) {}
 
             String Request = "?WATCH=" + Watch.toString() + ";\n";
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java	(revision 29435)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java	(revision 29769)
@@ -6,5 +6,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridLayout;
@@ -15,5 +14,4 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 
 import org.openstreetmap.josm.gui.MapFrame;
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java	(revision 29435)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java	(revision 29769)
@@ -52,4 +52,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             enableTracking(lgpscapture.isSelected());
@@ -66,4 +67,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (lgpslayer != null) {
@@ -84,4 +86,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (lgpslayer != null) {
@@ -91,10 +94,13 @@
     }
 
+    @Override
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
     }
 
+    @Override
     public void layerAdded(Layer newLayer) {
     }
 
+    @Override
     public void layerRemoved(Layer oldLayer) {
         if (oldLayer != lgpslayer)
@@ -110,7 +116,12 @@
         super(info);
         MainMenu menu = Main.main.menu;
-        lgpsmenu = menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G,
-                menu.defaultMenuPos, ht("/Plugin/LiveGPS"));
-
+        boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
+        lgpsmenu = oldMenu ?
+                menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS"))
+                : menu.gpsMenu;
+        if (lgpsmenu.getItemCount()>0) {
+            lgpsmenu.addSeparator();
+        }
+            
         JosmAction captureAction = new CaptureAction();
         lgpscapture = new JCheckBoxMenuItem(captureAction);
Index: applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 29435)
+++ applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 29769)
@@ -20,16 +20,20 @@
 
 
+    @Override
     public Map<String, Object> getAttributes() {
         return attr;
     }
 
+    @Override
     public Bounds getBounds() {
         return trackSegment.getBounds();
     }
 
+    @Override
     public Collection<GpxTrackSegment> getSegments() {
         return Collections.singleton(trackSegment);
     }
 
+    @Override
     public double length() {
         return trackSegment.length();