Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java	(revision 2974)
@@ -22,4 +22,5 @@
  */
 public class AutoSaveAction extends AbstractAction {
+    private static final long serialVersionUID = -8608679323231116043L;
     private static final long AUTO_SAVE_PERIOD_SEC = 60; // once a minute
     public static final String GPS_FILE_NAME_PATTERN = "surveyor-{0,date,yyyyMMdd-HHmmss}.gpx";
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java	(revision 2974)
@@ -13,5 +13,4 @@
 import javax.swing.JOptionPane;
 
-import livegps.LiveGpsLayer;
 import livegps.LiveGpsLock;
 
@@ -19,5 +18,4 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
-import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.GpxWriter;
 import org.openstreetmap.josm.io.XmlWriter;
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpsActionEvent.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpsActionEvent.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpsActionEvent.java	(revision 2974)
@@ -13,4 +13,5 @@
  */
 public class GpsActionEvent extends ActionEvent {
+    private static final long serialVersionUID = 2674961758007055637L;
     private LatLon coordinates;
     
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpxTrackMarkerWriter.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpxTrackMarkerWriter.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpxTrackMarkerWriter.java	(revision 2974)
@@ -13,5 +13,4 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
 import org.openstreetmap.josm.io.XmlWriter;
-import org.openstreetmap.josm.io.XmlWriter.OsmWriterInterface;
 
 /**
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/MetaAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/MetaAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/MetaAction.java	(revision 2974)
@@ -4,25 +4,10 @@
 package at.dallermassl.josm.plugin.surveyor;
 
-import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JTextField;
-
-import test.DialogClosingThread;
-
 
 import livegps.LiveGpsData;
@@ -35,4 +20,5 @@
  */
 public class MetaAction extends AbstractAction {
+    private static final long serialVersionUID = -1523524381092575809L;
     private List<SurveyorActionDescription> actions;
     private GpsDataSource gpsDataSource;
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java	(revision 2974)
@@ -7,5 +7,4 @@
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 import org.dinopolis.util.io.Tokenizer;
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 2974)
@@ -11,5 +11,4 @@
 import java.io.Reader;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -19,12 +18,4 @@
 import livegps.LiveGpsData;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Check;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Combo;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Item;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Key;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -35,5 +26,5 @@
  */
 public class SurveyorComponent extends JComponent implements PropertyChangeListener, GpsDataSource {
-    
+    private static final long serialVersionUID = 4539838472057529042L;
     private LiveGpsData gpsData;
     private int rows = 3;
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java	(revision 2974)
@@ -8,9 +8,5 @@
 import javax.swing.Action;
 
-import livegps.LiveGpsLock;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
 import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java	(revision 2974)
@@ -4,11 +4,6 @@
 package at.dallermassl.josm.plugin.surveyor.action;
 
-import java.util.List;
-
-import javax.swing.AbstractButton;
-
 import org.openstreetmap.josm.data.coor.LatLon;
 
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
 
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java	(revision 2974)
@@ -7,7 +7,4 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.sound.sampled.AudioFormat;
@@ -22,5 +19,4 @@
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 
 /**
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 2974)
@@ -9,6 +9,4 @@
 import java.util.Map.Entry;
 
-import javax.swing.Action;
-
 import livegps.LiveGpsLock;
 
@@ -17,6 +15,4 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
-import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
@@ -54,5 +50,5 @@
                 key = keyValuePair.substring(0, pos);
                 value = keyValuePair.substring(pos + 1);
-                keyValues.add(new Tuple(key, value));
+                keyValues.add(new Tuple<String, String>(key, value));
             } else {
                 System.err.println("SetNodeAction: ignoring invalid key value pair: " + keyValuePair);
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 2974)
@@ -8,5 +8,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.swing.JToggleButton;
@@ -21,5 +20,4 @@
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 
 /**
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java	(revision 2974)
@@ -6,13 +6,8 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 
 /**
@@ -28,5 +23,5 @@
     public void actionPerformed(GpsActionEvent event) {
         final ProcessBuilder builder = new ProcessBuilder(getParameters());
-        Map<String, String> environ = builder.environment();
+        //Map<String, String> environ = builder.environment();
         builder.directory(new File(System.getProperty("user.home")));
 
Index: /applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsDialog.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsDialog.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsDialog.java	(revision 2974)
@@ -29,4 +29,5 @@
  */
 public class LiveGpsDialog extends ToggleDialog implements PropertyChangeListener {
+    private static final long serialVersionUID = 6183400754671501117L;
     private JLabel statusLabel;
     private JLabel wayLabel;
Index: /applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsLayer.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsLayer.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsLayer.java	(revision 2974)
@@ -4,5 +4,4 @@
 import java.awt.Graphics;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
Index: /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/collection/Tuple.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/collection/Tuple.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/collection/Tuple.java	(revision 2974)
@@ -101,4 +101,5 @@
      * @see java.lang.Object#equals(java.lang.Object)
      */
+    @SuppressWarnings("unchecked")
     @Override
     public boolean equals(Object obj) {
Index: /applications/editors/josm/plugins/surveyor/src/test/DialogClosingThread.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/test/DialogClosingThread.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/test/DialogClosingThread.java	(revision 2974)
@@ -9,8 +9,5 @@
 import java.awt.event.KeyListener;
 
-import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
Index: /applications/editors/josm/plugins/surveyor/src/test/DialogTest.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/test/DialogTest.java	(revision 2973)
+++ /applications/editors/josm/plugins/surveyor/src/test/DialogTest.java	(revision 2974)
@@ -5,6 +5,4 @@
 
 import java.awt.BorderLayout;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -15,6 +13,4 @@
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
-
-import at.dallermassl.josm.plugin.surveyor.MetaAction;
 
 /**