Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java	(revision 2990)
@@ -27,4 +27,5 @@
  */
 public class DownloadAction extends JosmAction {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(DownloadAction.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java	(revision 2990)
@@ -2,9 +2,6 @@
 package org.openstreetmap.josm.actions;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -42,17 +39,17 @@
 
         String[] importerNames = {
-            "org.openstreetmap.josm.io.OsmImporter",
-            "org.openstreetmap.josm.io.OsmGzipImporter",
-            "org.openstreetmap.josm.io.GpxImporter",
-            "org.openstreetmap.josm.io.NMEAImporter",
-            "org.openstreetmap.josm.io.OsmBzip2Importer",
-            "org.openstreetmap.josm.io.JpgImporter",
-            "org.openstreetmap.josm.io.AllFormatsImporter"
+                "org.openstreetmap.josm.io.OsmImporter",
+                "org.openstreetmap.josm.io.OsmGzipImporter",
+                "org.openstreetmap.josm.io.GpxImporter",
+                "org.openstreetmap.josm.io.NMEAImporter",
+                "org.openstreetmap.josm.io.OsmBzip2Importer",
+                "org.openstreetmap.josm.io.JpgImporter",
+                "org.openstreetmap.josm.io.AllFormatsImporter"
         };
 
         for (String classname : importerNames) {
             try {
-                Class klass = Class.forName(classname);
-                importers.add((FileImporter)klass.newInstance());
+                Class<?> klass = Class.forName(classname);
+                importers.add((FileImporter) klass.newInstance());
             } catch (Exception e) {}
         }
@@ -61,13 +58,13 @@
 
         String[] exporterNames = {
-            "org.openstreetmap.josm.io.GpxExporter",
-            "org.openstreetmap.josm.io.OsmExporter",
-            "org.openstreetmap.josm.io.OsmGzipExporter",
-            "org.openstreetmap.josm.io.OsmBzip2Exporter"
+                "org.openstreetmap.josm.io.GpxExporter",
+                "org.openstreetmap.josm.io.OsmExporter",
+                "org.openstreetmap.josm.io.OsmGzipExporter",
+                "org.openstreetmap.josm.io.OsmBzip2Exporter"
         };
 
         for (String classname : exporterNames) {
             try {
-                Class klass = Class.forName(classname);
+                Class<?> klass = Class.forName(classname);
                 exporters.add((FileExporter)klass.newInstance());
             } catch (Exception e) {}
Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 2990)
@@ -28,5 +28,5 @@
     public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand() == null) {
-            String topic = null;
+            String topic;
             if (e.getSource() instanceof Component) {
                 Component c = SwingUtilities.getRoot((Component)e.getSource());
Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 2990)
@@ -36,4 +36,5 @@
  */
 public class UploadAction extends JosmAction{
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(UploadAction.class.getName());
     /**
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 2990)
@@ -375,13 +375,13 @@
             return;
 
-        if (mode == mode.select) {
+        if (mode == Mode.select) {
             // Nothing to be done
         } else {
-            if (mode == mode.extrude) {
+            if (mode == Mode.extrude) {
                 if (e.getPoint().distance(initialMousePos) > 10 && newN1en != null) {
                     // Commit extrusion
 
                     Node n1 = selectedSegment.way.getNode(selectedSegment.lowerIndex);
-                    Node n2 = selectedSegment.way.getNode(selectedSegment.lowerIndex+1);
+                    //Node n2 = selectedSegment.way.getNode(selectedSegment.lowerIndex+1);
                     Node n3 = new Node(Main.proj.eastNorth2latlon(newN2en));
                     Node n4 = new Node(Main.proj.eastNorth2latlon(newN1en));
@@ -399,5 +399,5 @@
                     Main.main.undoRedo.add(c);
                 }
-            } else if (mode == mode.translate) {
+            } else if (mode == Mode.translate) {
                 // I don't think there's anything to do
             }
Index: trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java	(revision 2990)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.util.Collection;
@@ -100,14 +99,14 @@
             if (value == null) {
                 switch(OsmPrimitiveType.from(primitive)) {
-                    case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
-                    case WAY: msg = marktr("Remove \"{0}\" for way ''{1}''"); break;
-                    case RELATION: msg = marktr("Remove \"{0}\" for relation ''{1}''"); break;
+                case NODE: msg = marktr("Remove \"{0}\" for node ''{1}''"); break;
+                case WAY: msg = marktr("Remove \"{0}\" for way ''{1}''"); break;
+                case RELATION: msg = marktr("Remove \"{0}\" for relation ''{1}''"); break;
                 }
                 text = tr(msg, key, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
             } else {
                 switch(OsmPrimitiveType.from(primitive)) {
-                    case NODE: msg = marktr("Set {0}={1} for node ''{2}''"); break;
-                    case WAY: msg = marktr("Set {0}={1} for way ''{2}''"); break;
-                    case RELATION: msg = marktr("Set {0}={1} for relation ''{2}''"); break;
+                case NODE: msg = marktr("Set {0}={1} for node ''{2}''"); break;
+                case WAY: msg = marktr("Set {0}={1} for way ''{2}''"); break;
+                case RELATION: msg = marktr("Set {0}={1} for relation ''{2}''"); break;
                 }
                 text = tr(msg, key, value, primitive.getDisplayName(DefaultNameFormatter.getInstance()));
Index: trunk/src/org/openstreetmap/josm/command/MoveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/MoveCommand.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/command/MoveCommand.java	(revision 2990)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.command;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
Index: trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java	(revision 2990)
@@ -25,4 +25,5 @@
  */
 public class TagConflictResolveCommand extends ConflictResolveCommand {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());
 
@@ -64,7 +65,7 @@
         String msg = "";
         switch(OsmPrimitiveType.from(conflict.getMy())) {
-            case NODE: msg = marktr("Resolve {0} tag conflicts in node {1}"); break;
-            case WAY: msg = marktr("Resolve {0} tag conflicts in way {1}"); break;
-            case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break;
+        case NODE: msg = marktr("Resolve {0} tag conflicts in node {1}"); break;
+        case WAY: msg = marktr("Resolve {0} tag conflicts in way {1}"); break;
+        case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break;
         }
         return new DefaultMutableTreeNode(
Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java	(revision 2990)
@@ -330,4 +330,5 @@
      */
     private class RelationUploadDependencyGraph {
+        @SuppressWarnings("unused")
         private final Logger logger = Logger.getLogger(RelationUploadDependencyGraph.class.getName());
         private HashMap<Relation, Set<Relation>> children;
Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 2990)
@@ -8,5 +8,4 @@
 import static java.lang.Math.sqrt;
 import static java.lang.Math.toRadians;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
 
Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java	(revision 2990)
@@ -35,4 +35,5 @@
  */
 public class ChangesetCache implements PreferenceChangedListener{
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 2990)
@@ -94,4 +94,5 @@
             case WAY: candidates  =targetDataSet.getWays(); break;
             case RELATION: candidates = targetDataSet.getRelations(); break;
+            default: throw new AssertionError();
             }
             for (OsmPrimitive target : candidates) {
@@ -127,4 +128,5 @@
         case WAY: target = source.isNew() ? new Way() : new Way(source.getId()); break;
         case RELATION: target = source.isNew() ? new Relation() : new Relation(source.getId()); break;
+        default: throw new AssertionError();
         }
         target.mergeFrom(source);
Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 2990)
@@ -640,5 +640,5 @@
     public TagCollection intersect(TagCollection other) {
         if (other == null) {
-            new TagCollection();
+            other = new TagCollection();
         }
         TagCollection ret = new TagCollection(this);
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 2990)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm.history;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.text.MessageFormat;
Index: trunk/src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java	(revision 2990)
@@ -20,6 +20,6 @@
 package org.openstreetmap.josm.data.projection;
 
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.io.Serializable;
 
@@ -34,6 +34,4 @@
  */
 public class NTV2SubGrid implements Cloneable, Serializable {
-
-    private static final int REC_SIZE = 16;
 
     private String subGridName;
Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 2990)
@@ -785,5 +785,5 @@
          * @since 1.1
          */
-        public TransferableObject( Class dataClass, Fetcher fetcher )
+        public TransferableObject(Class<?> dataClass, Fetcher fetcher )
         {   this.fetcher = fetcher;
         this.customFlavor = new java.awt.datatransfer.DataFlavor( dataClass, MIME_TYPE );
Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java	(revision 2990)
@@ -46,7 +46,7 @@
 
     /**
-     * Replies the unique instance of teh JOSM user identity manager
-     *
-     * @return the unique instance of teh JOSM user identity manager
+     * Replies the unique instance of the JOSM user identity manager
+     *
+     * @return the unique instance of the JOSM user identity manager
      */
     static public JosmUserIdentityManager getInstance() {
Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 2990)
@@ -24,4 +24,5 @@
  */
 public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
+    @SuppressWarnings("unused")
     private final static Logger logger = Logger.getLogger(PleaseWaitRunnable.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 2990)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair.nodes;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -167,17 +165,17 @@
         reset();
         switch(column) {
-            case 0:
-                renderRowId(getModel(table),row, isSelected);
-                break;
-            case 1:
-                if (node == null) {
-                    renderEmptyRow();
-                } else {
-                    renderNode(getModel(table), node, row, isSelected);
-                }
-                break;
-            default:
-                // should not happen
-                throw new RuntimeException(MessageFormat.format("Unexpected column index. Got {0}.", column));
+        case 0:
+            renderRowId(getModel(table),row, isSelected);
+            break;
+        case 1:
+            if (node == null) {
+                renderEmptyRow();
+            } else {
+                renderNode(getModel(table), node, row, isSelected);
+            }
+            break;
+        default:
+            // should not happen
+            throw new RuntimeException(MessageFormat.format("Unexpected column index. Got {0}.", column));
         }
         return this;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 2990)
@@ -4,5 +4,4 @@
 import java.awt.Color;
 import java.awt.Component;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,5 +26,4 @@
  */
 public  class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer {
-    private final static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000");
     public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
     public final static Color BGCOLOR_EMPTY_ROW = new Color(234,234,234);
@@ -194,23 +192,23 @@
         renderForeground(getModel(table), member, row, column, isSelected);
         switch(column) {
-            case 0:
-                renderRowId(row);
-                break;
-            case 1:
-                if (member == null) {
-                    renderEmptyRow();
-                } else {
-                    renderRole(member);
-                }
-                break;
-            case 2:
-                if (member == null) {
-                    renderEmptyRow();
-                } else {
-                    renderPrimitive(member);
-                }
-                break;
-            default:
-                // should not happen
+        case 0:
+            renderRowId(row);
+            break;
+        case 1:
+            if (member == null) {
+                renderEmptyRow();
+            } else {
+                renderRole(member);
+            }
+            break;
+        case 2:
+            if (member == null) {
+                renderEmptyRow();
+            } else {
+                renderPrimitive(member);
+            }
+            break;
+        default:
+            // should not happen
         }
         return this;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java	(revision 2990)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair.tags;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 2990)
@@ -8,5 +8,4 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
@@ -134,8 +133,8 @@
     public String getChosenValue() throws IllegalStateException {
         switch(type) {
-            case UNDECIDED: throw new IllegalStateException(tr("Not decided yet."));
-            case KEEP_ONE: return value;
-            case KEEP_NONE: return null;
-            case KEEP_ALL: return tags.getJoinedValues(getKey());
+        case UNDECIDED: throw new IllegalStateException(tr("Not decided yet."));
+        case KEEP_ONE: return value;
+        case KEEP_NONE: return null;
+        case KEEP_ALL: return tags.getJoinedValues(getKey());
         }
         // should not happen
@@ -282,8 +281,8 @@
     public Tag getResolution() {
         switch(type) {
-            case KEEP_ALL: return new Tag(getKey(), tags.getJoinedValues(getKey()));
-            case KEEP_ONE: return new Tag(getKey(),value);
-            case KEEP_NONE: return new Tag(getKey(), "");
-            case UNDECIDED: return null;
+        case KEEP_ALL: return new Tag(getKey(), tags.getJoinedValues(getKey()));
+        case KEEP_ONE: return new Tag(getKey(),value);
+        case KEEP_NONE: return new Tag(getKey(), "");
+        case UNDECIDED: return null;
         }
         return null;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 2990)
@@ -433,4 +433,5 @@
 
     static private class StatisticsInfoRenderer extends JLabel implements TableCellRenderer {
+        @SuppressWarnings("unused")
         static private final Logger logger = Logger.getLogger(StatisticsInfoRenderer.class.getName());
 
@@ -461,7 +462,7 @@
                 String msg = "";
                 switch(type) {
-                    case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives,numPrimitives); break;
-                    case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
-                    case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
+                case NODE: msg = trn("{0} node", "{0} nodes", numPrimitives,numPrimitives); break;
+                case WAY: msg = trn("{0} way", "{0} ways", numPrimitives, numPrimitives); break;
+                case RELATION: msg = trn("{0} relation", "{0} relations", numPrimitives, numPrimitives); break;
                 }
                 text = text.equals("") ? msg : text + ", " + msg;
@@ -488,7 +489,7 @@
 
                 switch(column) {
-                    case 0: renderNumTags(info); break;
-                    case 1: renderFrom(info); break;
-                    case 2: renderTo(info); break;
+                case 0: renderNumTags(info); break;
+                case 1: renderFrom(info); break;
+                case 2: renderTo(info); break;
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java	(revision 2990)
@@ -4,6 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 2990)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.tags;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.beans.PropertyChangeListener;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java	(revision 2990)
@@ -136,6 +136,6 @@
      */
     static private class ChangesetContentEntry implements ChangesetDataSetEntry{
-        private ChangesetModificationType modificationType;
-        private HistoryOsmPrimitive primitive;
+        private final ChangesetModificationType modificationType;
+        private final HistoryOsmPrimitive primitive;
 
         public ChangesetContentEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {
@@ -145,6 +145,5 @@
 
         public ChangesetContentEntry(ChangesetDataSetEntry entry) {
-            this.modificationType = entry.getModificationType();
-            this.primitive = entry.getPrimitive();
+            this(entry.getModificationType(), entry.getPrimitive());
         }
 
@@ -152,13 +151,7 @@
             return modificationType;
         }
-        public void setModificationType(ChangesetModificationType modificationType) {
-            this.modificationType = modificationType;
-        }
         public HistoryOsmPrimitive getPrimitive() {
             return primitive;
         }
-        public void setPrimitive(HistoryOsmPrimitive primitive) {
-            this.primitive = primitive;
-        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(revision 2990)
@@ -1086,16 +1086,10 @@
 
         public Date getDate() {
-            for (int i = 0; i< 4; i++) {
+            for (int format: new int[] {DateFormat.SHORT, DateFormat.MEDIUM, DateFormat.LONG, DateFormat.FULL}) {
+                DateFormat df = DateFormat.getDateInstance(format);
                 try {
-                    DateFormat df = null;
-                    switch(i) {
-                    case 0: df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()); break;
-                    case 1: df = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault()); break;
-                    case 2: df = DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault()); break;
-                    case 3: df = DateFormat.getDateInstance(DateFormat.FULL,Locale.getDefault()); break;
-                    }
                     return df.parse(getComponent().getText());
-                } catch(ParseException e) {
-                    continue;
+                } catch (ParseException e) {
+                    // Try next format
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 2990)
@@ -77,4 +77,5 @@
  */
 public class GenericRelationEditor extends RelationEditor  {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(GenericRelationEditor.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java	(revision 2990)
@@ -15,6 +15,5 @@
 
 public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
-
-    /** the logger object */
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 2990)
@@ -1,6 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.relation;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -11,6 +9,6 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction;
 
 public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
@@ -38,7 +36,6 @@
     public void paintComponent(Graphics g) {
         super.paintComponent(g);
-        if (value == null || !value.isValid()) {
+        if (value == null || !value.isValid())
             return;
-        }
 
         int ymax=this.getSize().height - 1;
@@ -102,10 +99,10 @@
         Image arrow = null;
         switch (value.direction) {
-            case FORWARD:
-                arrow = arrowDown;
-                break;
-            case BACKWARD:
-                arrow = arrowUp;
-                break;
+        case FORWARD:
+            arrow = arrowDown;
+            break;
+        case BACKWARD:
+            arrow = arrowUp;
+            break;
         }
         if ((arrow != null) && (value.linkPrev || value.linkNext)) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 2990)
@@ -35,4 +35,5 @@
  */
 public class RelationTree extends JTree {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(RelationTree.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java	(revision 2990)
@@ -2,7 +2,6 @@
 package org.openstreetmap.josm.gui.dialogs.relation;
 
+import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.NONE;
 import static org.openstreetmap.josm.tools.I18n.tr;
-
-import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.*;
 
 public class WayConnectionType {
@@ -32,5 +31,5 @@
             return this == ROUNDABOUT_RIGHT || this == ROUNDABOUT_LEFT;
         }
-    };
+    }
 
     /** True, if the element is part of a closed loop of ways. */
@@ -66,19 +65,14 @@
 
     public String getToolTip() {
-        if (!isValid()) {
+        if (!isValid())
             return "";
-        }
-        else if (linkPrev && linkNext) {
+        else if (linkPrev && linkNext)
             return tr("way is connected");
-        }
-        else if (linkPrev) {
+        else if (linkPrev)
             return tr("way is connected to previous relation member");
-        }
-        else if (linkNext) {
+        else if (linkNext)
             return tr("way is connected to next relation member");
-        }
-        else {
+        else
             return tr("way is not connected to previous or next relation member");
-        }//FIXME: isLoop & direction
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2990)
@@ -51,4 +51,5 @@
  */
 public class DownloadDialog extends JDialog  {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(DownloadDialog.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java	(revision 2990)
@@ -4,6 +4,4 @@
 
 import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
Index: trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java	(revision 2990)
@@ -19,5 +19,5 @@
  */
 public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
-
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(TagTableCellRenderer.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 2990)
@@ -32,4 +32,5 @@
  */
 public class VersionInfoPanel extends JPanel implements Observer{
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(VersionInfoPanel.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java	(revision 2990)
@@ -28,4 +28,5 @@
 public class VersionTableCellRenderer extends JLabel implements TableCellRenderer {
 
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(VersionTableCellRenderer.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java	(revision 2990)
@@ -66,6 +66,6 @@
                             + "to know the identity of the user on whose behalf you are working.")
                             + "</html>",
-                    tr("Missing user identity"),
-                    JOptionPane.ERROR_MESSAGE
+                            tr("Missing user identity"),
+                            JOptionPane.ERROR_MESSAGE
             );
             return;
@@ -100,7 +100,6 @@
      */
     protected void refreshUserIdentity(){
-        JosmUserIdentityManager im = null;
+        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
         try {
-            im = JosmUserIdentityManager.getInstance();
             OsmServerUserInfoReader reader = new OsmServerUserInfoReader();
             UserInfo info = reader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false));
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java	(revision 2990)
@@ -6,6 +6,4 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
Index: trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java	(revision 2990)
@@ -34,4 +34,5 @@
  */
 public class UpdatePrimitivesTask extends PleaseWaitRunnable {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java	(revision 2990)
@@ -27,5 +27,5 @@
 
 public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{
-
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(UploadParameterSummaryPanel.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java	(revision 2990)
@@ -39,4 +39,5 @@
  */
 public class UploadPrimitivesTask extends  AbstractUploadTask {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(UploadPrimitivesTask.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 2990)
@@ -257,14 +257,12 @@
 
                     File sel[] = fc.getSelectedFiles();
-                    if (sel != null) {
-                        // sort files in increasing order of timestamp (this is the end time, but so
-                        // long as they don't overlap, that's fine)
-                        if (sel.length > 1) {
-                            Arrays.sort(sel, new Comparator<File>() {
-                                public int compare(File a, File b) {
-                                    return a.lastModified() <= b.lastModified() ? -1 : 1;
-                                }
-                            });
-                        }
+                    // sort files in increasing order of timestamp (this is the end time, but so
+                    // long as they don't overlap, that's fine)
+                    if (sel.length > 1) {
+                        Arrays.sort(sel, new Comparator<File>() {
+                            public int compare(File a, File b) {
+                                return a.lastModified() <= b.lastModified() ? -1 : 1;
+                            }
+                        });
                     }
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2990)
@@ -41,5 +41,4 @@
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -236,5 +235,5 @@
                 Main.main.addLayer(layer);
                 layer.hook_up_mouse_events(); // Main.map.mapView should exist
-                                              // now. Can add mouse listener
+                // now. Can add mouse listener
                 Main.map.mapView.addPropertyChangeListener(layer);
                 if (Main.map.getToggleDialog(ImageViewerDialog.class) == null) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 2990)
@@ -83,5 +83,5 @@
 
             boolean error = tracker.isErrorID(1);
-            if (img != null && (img.getWidth(null) == 0 || img.getHeight(null) == 0)) {
+            if (img.getWidth(null) == 0 || img.getHeight(null) == 0) {
                 error = true;
             }
@@ -439,6 +439,6 @@
             g.setColor(Color.black);
             String loadingStr;
-            if (! errorLoading) {;
-            loadingStr = tr("Loading {0}", file.getName());
+            if (! errorLoading) {
+                loadingStr = tr("Loading {0}", file.getName());
             } else {
                 loadingStr = tr("Error on file {0}", file.getName());
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 2990)
@@ -4,6 +4,6 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -58,4 +58,5 @@
     }
 
+    @SuppressWarnings("null")
     public static void readFromPreferences() {
         iconDirs = Main.pref.getCollection("mappaint.icon.sources", Collections.<String>emptySet());
@@ -95,7 +96,7 @@
                     zipIcons = in.getFile();
                     xmlReader.parse(new InputSource(zip));
+                } else {
+                    xmlReader.parse(new InputSource(in));
                 }
-                else
-                    xmlReader.parse(new InputSource(in));
             } catch(IOException e) {
                 System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 2990)
@@ -224,5 +224,5 @@
      */
     protected JPanel buildResultsPanel() {
-        JPanel pnl = new JPanel(new GridBagLayout());;
+        JPanel pnl = new JPanel(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
         pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java	(revision 2990)
@@ -52,4 +52,5 @@
  */
 public class OAuthAuthorizationWizard extends JDialog {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OAuthAuthorizationWizard.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java	(revision 2990)
@@ -36,4 +36,5 @@
 
 public class OsmOAuthAuthorizationClient {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OsmOAuthAuthorizationClient.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 2990)
@@ -53,4 +53,5 @@
 
 public class PluginPreference implements PreferenceSetting {
+    @SuppressWarnings("unused")
     private final static Logger logger = Logger.getLogger(PluginPreference.class.getName());
 
@@ -297,5 +298,5 @@
                     }
                 });
-            };
+            }
         };
         Main.worker.submit(task);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 2990)
@@ -40,4 +40,5 @@
  */
 public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(PreferenceTabbedPane.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java	(revision 2990)
@@ -7,5 +7,4 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.util.Collection;
 
@@ -110,6 +109,7 @@
         String projname = proj.getClass().getName();
         Collection<String> prefs = null;
-        if(projHasPrefs(proj))
+        if(projHasPrefs(proj)) {
             prefs = ((ProjectionSubPrefs) proj).getPreferences(projSubPrefPanel);
+        }
 
         Main.pref.put("projection", projname);
@@ -143,5 +143,5 @@
     {
         setProjection(Main.pref.get("projection", Mercator.class.getName()),
-        Main.pref.getCollection("projection.sub", null));
+                Main.pref.getCollection("projection.sub", null));
     }
 
@@ -167,6 +167,7 @@
         String sname = name.substring(name.lastIndexOf(".")+1);
         Main.pref.putCollection("projection.sub."+sname, coll);
-        if(projHasPrefs(Main.proj))
+        if(projHasPrefs(Main.proj)) {
             ((ProjectionSubPrefs) Main.proj).setPreferences(coll);
+        }
         if(b != null && (!Main.proj.getClass().getName().equals(oldProj.getClass().getName()) || Main.proj.hashCode() != oldProj.hashCode()))
         {
@@ -181,15 +182,15 @@
         public SBPanel(Projection pr)
         {
-          super();
-          p = pr;
+            super();
+            p = pr;
         }
         @Override
         public void paint(java.awt.Graphics g)
         {
-          super.paint(g);
-          ((ProjectionSubPrefs) p).setPreferences(((ProjectionSubPrefs) p).getPreferences(this));
-          updateMeta(p);
-        }
-    };
+            super.paint(g);
+            ((ProjectionSubPrefs) p).setPreferences(((ProjectionSubPrefs) p).getPreferences(this));
+            updateMeta(p);
+        }
+    }
 
     /**
@@ -228,6 +229,7 @@
             String name = proj.getClass().getName();
             String sname = name.substring(name.lastIndexOf(".")+1);
-            if(projHasPrefs(proj))
+            if(projHasPrefs(proj)) {
                 ((ProjectionSubPrefs) proj).setPreferences(Main.pref.getCollection("projection.sub."+sname, null));
+            }
             if (name.equals(Main.pref.get("projection", Mercator.class.getName()))) {
                 projectionCombo.setSelectedIndex(i);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java	(revision 2990)
@@ -26,4 +26,5 @@
 
 public class PluginListPanel extends VerticallyScrollablePanel{
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(PluginListPanel.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 2990)
@@ -21,4 +21,5 @@
 
 public class PluginPreferencesModel extends Observable{
+    @SuppressWarnings("unused")
     private final static Logger logger = Logger.getLogger(PluginPreferencesModel.class.getName());
 
@@ -157,11 +158,10 @@
         if (pi != null) {
             selectedPluginsMap.put(pi,selected);
+            if (pi.isUpdateRequired()) {
+                pendingDownloads.add(pi.name);
+            }
         }
         if (!selected) {
             pendingDownloads.remove(name);
-            return;
-        }
-        if (pi.isUpdateRequired()) {
-            pendingDownloads.add(pi.name);
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java	(revision 2990)
@@ -14,4 +14,5 @@
 
 public class OAuthAccessTokenHolder {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OAuthAccessTokenHolder.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	(revision 2990)
@@ -45,4 +45,5 @@
  */
 public class OAuthAuthenticationPreferencesPanel extends JPanel implements PropertyChangeListener {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(OAuthAuthenticationPreferencesPanel.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 2990)
@@ -5,6 +5,4 @@
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
Index: trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java	(revision 2990)
@@ -33,5 +33,5 @@
  */
 public class AutoCompletingTextField extends JTextField implements ComboBoxEditor, TableCellEditor {
-
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(AutoCompletingTextField.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java	(revision 2990)
@@ -21,5 +21,5 @@
  */
 public class TagCellRenderer extends JLabel implements TableCellRenderer  {
-
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(TagCellRenderer.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 2990)
@@ -33,4 +33,5 @@
 @SuppressWarnings("serial")
 public class TagEditorModel extends AbstractTableModel {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(TagEditorModel.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java	(revision 2990)
@@ -26,4 +26,5 @@
  */
 public class TagEditorPanel extends JPanel {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(TagEditorPanel.class.getName());
     /** the tag editor model */
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java	(revision 2990)
@@ -37,4 +37,5 @@
  */
 public class AutoCompletionCache {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(AutoCompletionCache.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/io/CacheFiles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/CacheFiles.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/CacheFiles.java	(revision 2990)
@@ -43,7 +43,7 @@
 
     // If the cache is full, we don't want to delete just one file
-    private static final int cleanUpThreshold = 20;
+    private static final int CLEANUP_TRESHOLD = 20;
     // We don't want to clean after every file-write
-    private static final int cleanUpInterval = 5;
+    private static final int CLEANUP_INTERVAL = 5;
     // Stores how many files have been written
     private int writes = 0;
@@ -221,5 +221,5 @@
      */
     public void checkCleanUp() {
-        if(this.writes > this.cleanUpInterval) {
+        if(this.writes > CLEANUP_INTERVAL) {
             cleanUp();
         }
@@ -254,5 +254,5 @@
 
             // Delete a couple of files, then check again
-            if(i % cleanUpThreshold == 0 && getDirSize() < maxsize)
+            if(i % CLEANUP_TRESHOLD == 0 && getDirSize() < maxsize)
                 return;
         }
Index: trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 2990)
@@ -24,4 +24,5 @@
  */
 public class DefaultProxySelector extends ProxySelector {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(DefaultProxySelector.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 2990)
@@ -72,11 +72,11 @@
         try {
             if(file != null && (file.getName().endsWith(".zip")
-            || file.getName().endsWith(".ZIP")))
+                    || file.getName().endsWith(".ZIP")))
             {
                 ZipFile zipFile = new ZipFile(file);
                 ZipEntry resentry = null;
-                Enumeration entries = zipFile.entries();
+                Enumeration<? extends ZipEntry> entries = zipFile.entries();
                 while(entries.hasMoreElements()) {
-                    ZipEntry entry = (ZipEntry)entries.nextElement();
+                    ZipEntry entry = entries.nextElement();
                     if(entry.getName().endsWith("."+extension)) {
                         /* choose any file with correct extension. When more than
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 2990)
@@ -50,4 +50,5 @@
  */
 public class OsmApi extends OsmConnection {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OsmApi.class.getName());
     /** max number of retries to send a request in case of HTTP 500 errors or timeouts */
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java	(revision 2990)
@@ -135,6 +135,6 @@
                 throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
-            if (v.equals("true")) return true;
-            if (v.equals("false")) return false;
+            if ("true".equals(v)) return true;
+            if ("false".equals(v)) return false;
             throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
             // not reached
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 2990)
@@ -39,4 +39,5 @@
  */
 public class OsmChangesetParser {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OsmChangesetParser.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 2990)
@@ -31,4 +31,5 @@
  */
 public class OsmConnection {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(OsmConnection.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 2990)
@@ -29,4 +29,5 @@
  */
 public abstract class OsmServerReader extends OsmConnection {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OsmServerReader.class.getName());
     private OsmApi api = OsmApi.getOsmApi();
Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 2990)
@@ -29,4 +29,5 @@
  */
 public class OsmServerWriter {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OsmServerWriter.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java	(revision 2990)
@@ -17,4 +17,5 @@
  */
 public  class DefaultAuthenticator extends Authenticator {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(DefaultAuthenticator.class.getName());
     private static DefaultAuthenticator instance;
Index: trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java	(revision 2990)
@@ -35,4 +35,5 @@
  */
 public class PluginDownloadTask extends PleaseWaitRunnable{
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(PluginDownloadTask.class.getName());
 
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 2990)
@@ -212,7 +212,7 @@
         policy = policy.trim().toLowerCase();
         if (policy.equals("never")) {
-            if (togglePreferenceKey.equals("pluginmanager.version-based-update.policy")) {
+            if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
                 System.out.println(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."));
-            } else if (togglePreferenceKey.equals("pluginmanager.time-based-update.policy")) {
+            } else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
                 System.out.println(tr("Skipping plugin update after elapsed update interval. Automatic update at startup is disabled."));
             }
@@ -221,7 +221,7 @@
 
         if (policy.equals("always")) {
-            if (togglePreferenceKey.equals("pluginmanager.time-based-update.policy")) {
+            if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
                 System.out.println(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled."));
-            } else if (togglePreferenceKey.equals("pluginmanager.time-based-update.policy")) {
+            } else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
                 System.out.println(tr("Running plugin update after elapsed update interval. Automatic update at startup is disabled."));
             }
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 2990)
@@ -17,6 +17,6 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -103,8 +103,6 @@
                     MirroredInputStream is = new MirroredInputStream(name, new File(Main.pref.getPreferencesDir(),
                     "images").toString());
-                    if (is != null) {
-                        img = Toolkit.getDefaultToolkit().createImage(is.getFile().toURI().toURL());
-                        cache.put(name, img);
-                    }
+                    img = Toolkit.getDefaultToolkit().createImage(is.getFile().toURI().toURL());
+                    cache.put(name, img);
                 } catch (IOException e) {
                 }
@@ -123,6 +121,7 @@
         if (dirs != null && dirs.size() > 0) {
             cache_name = "id:" + id + ":" + full_name;
-            if(archive != null)
+            if(archive != null) {
                 cache_name += ":" + archive.getName();
+            }
         }
 
Index: trunk/src/org/openstreetmap/josm/tools/MultiMap.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/MultiMap.java	(revision 2989)
+++ trunk/src/org/openstreetmap/josm/tools/MultiMap.java	(revision 2990)
@@ -2,7 +2,6 @@
 package org.openstreetmap.josm.tools;
 
+import java.util.HashMap;
 import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.HashMap;
 
 /**
@@ -21,5 +20,5 @@
         vals.add(value);
     }
-    
+
     /**
      * Put a key that maps to nothing.