Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 16624)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 16625)
@@ -317,8 +317,4 @@
                 }
 
-                // This try/catch is a hack to stop the flooding bug reports about this.
-                // The exception needed to handle with in the first place, means that this
-                // access to the data need to be restarted, if the main thread modifies the data.
-                DataSet ds = null;
                 // The popup != null check is required because a left-click produces several events as well,
                 // which would make this variable true. Of course we only want the popup to show
@@ -328,5 +324,5 @@
                 boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
 
-                ds = mv.getLayerManager().getActiveDataSet();
+                DataSet ds = mv.getLayerManager().getActiveDataSet();
                 if (ds != null) {
                     // This is not perfect, if current dataset was changed during execution, the lock would be useless
@@ -340,4 +336,7 @@
                     }
                 }
+                // This try/catch is a hack to stop the flooding bug reports about this.
+                // The exception needed to handle with in the first place, means that this
+                // access to the data need to be restarted, if the main thread modifies the data.
                 try {
                     // Set the text label in the bottom status bar
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java	(revision 16624)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java	(revision 16625)
@@ -22,5 +22,5 @@
      */
     public MemberTableColumnModel(AutoCompletionManager autoCompletionManager, Relation relation) {
-        TableColumn col = null;
+        TableColumn col;
 
         // column 0 - the member role
Index: trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java	(revision 16624)
+++ trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxImporter.java	(revision 16625)
@@ -146,7 +146,6 @@
     public static GpxImporterData loadLayers(final GpxData data, final boolean parsedProperly,
             final String gpxLayerName, String markerLayerName) {
-        GpxLayer gpxLayer = null;
         MarkerLayer markerLayer = null;
-        gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
+        GpxLayer gpxLayer = new GpxLayer(data, gpxLayerName, data.storageFile != null);
         if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
             markerLayer = new MarkerLayer(data, markerLayerName, data.storageFile, gpxLayer);
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java	(revision 16624)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java	(revision 16625)
@@ -285,5 +285,4 @@
         msg.add(scrollPane, GBC.eol().fill(GBC.BOTH));
 
-        int v = 1;
         // build dialog
         ExtendedDialog ed = new ExtendedDialog(MainApplication.getMainFrame(),
@@ -313,5 +312,5 @@
         ed.showDialog();
         dateFilter.saveInPrefs();
-        v = ed.getValue();
+        int v = ed.getValue();
         // cancel for unknown buttons and copy back original settings
         if (v != 2 && v != 3) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 16624)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 16625)
@@ -376,5 +376,5 @@
     }
 
-    @SuppressWarnings("PMD.UnusedFormalParameter")
+    @SuppressWarnings({"PMD.UnusedFormalParameter", "UnusedVariable"})
     private static boolean isRemoveColor(ColorEntry ce) {
         return false;