Changeset 2990 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-02-15T09:03:57+01:00 (14 years ago)

Author:

jttt

Message:

Fix some eclipse warnings

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• FileDrop.java (modified) (1 diff)
• JosmUserIdentityManager.java (modified) (1 diff)
• PleaseWaitRunnable.java (modified) (1 diff)
• conflict/pair/nodes/NodeListTableCellRenderer.java (modified) (2 diffs)
• conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) (3 diffs)
• conflict/pair/tags/TagMergeTableCellRenderer.java (modified) (1 diff)
• conflict/tags/MultiValueResolutionDecision.java (modified) (3 diffs)
• conflict/tags/PasteTagsConflictResolverDialog.java (modified) (3 diffs)
• conflict/tags/RelationMemberConflictDecisionType.java (modified) (1 diff)
• conflict/tags/TagConflictResolverModel.java (modified) (1 diff)
• dialogs/changeset/ChangesetContentTableModel.java (modified) (3 diffs)
• dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) (1 diff)
• dialogs/relation/GenericRelationEditor.java (modified) (1 diff)
• dialogs/relation/MemberRoleCellEditor.java (modified) (1 diff)
• dialogs/relation/MemberTableLinkedCellRenderer.java (modified) (4 diffs)
• dialogs/relation/RelationTree.java (modified) (1 diff)
• dialogs/relation/WayConnectionType.java (modified) (3 diffs)
• download/DownloadDialog.java (modified) (1 diff)
• history/CoordinateInfoViewer.java (modified) (1 diff)
• history/TagTableCellRenderer.java (modified) (1 diff)
• history/VersionInfoPanel.java (modified) (1 diff)
• history/VersionTableCellRenderer.java (modified) (1 diff)
• io/DownloadOpenChangesetsTask.java (modified) (2 diffs)
• io/SaveLayerInfo.java (modified) (1 diff)
• io/UpdatePrimitivesTask.java (modified) (1 diff)
• io/UploadParameterSummaryPanel.java (modified) (1 diff)
• io/UploadPrimitivesTask.java (modified) (1 diff)
• layer/GpxLayer.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (2 diffs)
• layer/geoimage/ImageDisplay.java (modified) (2 diffs)
• mappaint/MapPaintStyles.java (modified) (3 diffs)
• oauth/FullyAutomaticAuthorizationUI.java (modified) (1 diff)
• oauth/OAuthAuthorizationWizard.java (modified) (1 diff)
• oauth/OsmOAuthAuthorizationClient.java (modified) (1 diff)
• preferences/PluginPreference.java (modified) (2 diffs)
• preferences/PreferenceTabbedPane.java (modified) (1 diff)
• preferences/ProjectionPreference.java (modified) (6 diffs)
• preferences/plugin/PluginListPanel.java (modified) (1 diff)
• preferences/plugin/PluginPreferencesModel.java (modified) (2 diffs)
• preferences/server/OAuthAccessTokenHolder.java (modified) (1 diff)
• preferences/server/OAuthAuthenticationPreferencesPanel.java (modified) (1 diff)
• progress/SwingRenderingProgressMonitor.java (modified) (1 diff)
• tagging/AutoCompletingTextField.java (modified) (1 diff)
• tagging/TagCellRenderer.java (modified) (1 diff)
• tagging/TagEditorModel.java (modified) (1 diff)
• tagging/TagEditorPanel.java (modified) (1 diff)
• tagging/ac/AutoCompletionCache.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/FileDrop.java

@@ -785 +785 @@
          * @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 );

trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

@@ -46 +46 @@
 
     /**
-     * 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() {

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -24 +24 @@
  */
 public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
+    @SuppressWarnings("unused")
     private final static Logger logger = Logger.getLogger(PleaseWaitRunnable.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

@@ -1 +1 @@
 // 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 +165 @@
         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;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Component;
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27 +26 @@
  */
 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 +192 @@
         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;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java

@@ -1 +1 @@
 // 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;

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -8 +8 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
@@ -134 +133 @@
     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 +281 @@
     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;

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -433 +433 @@
 
     static private class StatisticsInfoRenderer extends JLabel implements TableCellRenderer {
+        @SuppressWarnings("unused")
         static private final Logger logger = Logger.getLogger(StatisticsInfoRenderer.class.getName());
 
@@ -461 +462 @@
                 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 +489 @@
 
                 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;
                 }
             }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
 import javax.swing.JLabel;
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -1 +1 @@
 // 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;

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java

@@ -136 +136 @@
      */
     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 +145 @@
 
         public ChangesetContentEntry(ChangesetDataSetEntry entry) {
-            this.modificationType = entry.getModificationType();
-            this.primitive = entry.getPrimitive();
+            this(entry.getModificationType(), entry.getPrimitive());
         }
 
@@ -152 +151 @@
             return modificationType;
         }
-        public void setModificationType(ChangesetModificationType modificationType) {
-            this.modificationType = modificationType;
-        }
         public HistoryOsmPrimitive getPrimitive() {
             return primitive;
         }
-        public void setPrimitive(HistoryOsmPrimitive primitive) {
-            this.primitive = primitive;
-        }
     }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

@@ -1086 +1086 @@
 
         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
                 }
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -77 +77 @@
  */
 public class GenericRelationEditor extends RelationEditor  {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(GenericRelationEditor.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java

@@ -15 +15 @@
 
 public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
-
-    /** the logger object */
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java

@@ -1 +1 @@
 // 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 +9 @@
 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 +36 @@
     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 +99 @@
         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)) {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

@@ -35 +35 @@
  */
 public class RelationTree extends JTree {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(RelationTree.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java

@@ -2 +2 @@
 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 +31 @@
             return this == ROUNDABOUT_RIGHT || this == ROUNDABOUT_LEFT;
         }
-    };
+    }
 
     /** True, if the element is part of a closed loop of ways. */
@@ -66 +65 @@
 
     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
     }
 }

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -51 +51 @@
  */
 public class DownloadDialog extends JDialog  {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(DownloadDialog.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -4 +4 @@
 
 import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

@@ -19 +19 @@
  */
 public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
-
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(TagTableCellRenderer.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -32 +32 @@
  */
 public class VersionInfoPanel extends JPanel implements Observer{
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(VersionInfoPanel.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java

@@ -28 +28 @@
 public class VersionTableCellRenderer extends JLabel implements TableCellRenderer {
 
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(VersionTableCellRenderer.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java

@@ -66 +66 @@
                             + "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 +100 @@
      */
     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));

trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java

@@ -6 +6 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**

trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java

@@ -34 +34 @@
  */
 public class UpdatePrimitivesTask extends PleaseWaitRunnable {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

@@ -27 +27 @@
 
 public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{
-
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(UploadParameterSummaryPanel.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -39 +39 @@
  */
 public class UploadPrimitivesTask extends  AbstractUploadTask {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(UploadPrimitivesTask.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -257 +257 @@
 
                     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;
+                            }
+                        });
                     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -41 +41 @@
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -236 +235 @@
                 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) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -83 +83 @@
 
             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 +439 @@
             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());

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -4 +4 @@
 
 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 +58 @@
     }
 
+    @SuppressWarnings("null")
     public static void readFromPreferences() {
         iconDirs = Main.pref.getCollection("mappaint.icon.sources", Collections.<String>emptySet());
@@ -95 +96 @@
                     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()));

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -224 +224 @@
      */
     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));

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -52 +52 @@
  */
 public class OAuthAuthorizationWizard extends JDialog {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OAuthAuthorizationWizard.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -36 +36 @@
 
 public class OsmOAuthAuthorizationClient {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OsmOAuthAuthorizationClient.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -53 +53 @@
 
 public class PluginPreference implements PreferenceSetting {
+    @SuppressWarnings("unused")
     private final static Logger logger = Logger.getLogger(PluginPreference.class.getName());
 
@@ -297 +298 @@
                     }
                 });
-            };
+            }
         };
         Main.worker.submit(task);

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -40 +40 @@
  */
 public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(PreferenceTabbedPane.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.util.Collection;
 
@@ -110 +109 @@
         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 +143 @@
     {
         setProjection(Main.pref.get("projection", Mercator.class.getName()),
-        Main.pref.getCollection("projection.sub", null));
+                Main.pref.getCollection("projection.sub", null));
     }
 
@@ -167 +167 @@
         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 +182 @@
         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 +229 @@
             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);

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -26 +26 @@
 
 public class PluginListPanel extends VerticallyScrollablePanel{
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(PluginListPanel.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -21 +21 @@
 
 public class PluginPreferencesModel extends Observable{
+    @SuppressWarnings("unused")
     private final static Logger logger = Logger.getLogger(PluginPreferencesModel.class.getName());
 
@@ -157 +158 @@
         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);
         }
     }

trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java

@@ -14 +14 @@
 
 public class OAuthAccessTokenHolder {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(OAuthAccessTokenHolder.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

@@ -45 +45 @@
  */
 public class OAuthAuthenticationPreferencesPanel extends JPanel implements PropertyChangeListener {
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(OAuthAuthenticationPreferencesPanel.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**

trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java

@@ -33 +33 @@
  */
 public class AutoCompletingTextField extends JTextField implements ComboBoxEditor, TableCellEditor {
-
+    @SuppressWarnings("unused")
     static private Logger logger = Logger.getLogger(AutoCompletingTextField.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java

@@ -21 +21 @@
  */
 public class TagCellRenderer extends JLabel implements TableCellRenderer  {
-
+    @SuppressWarnings("unused")
     private static final Logger logger = Logger.getLogger(TagCellRenderer.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -33 +33 @@
 @SuppressWarnings("serial")
 public class TagEditorModel extends AbstractTableModel {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(TagEditorModel.class.getName());
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -26 +26 @@
  */
 public class TagEditorPanel extends JPanel {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(TagEditorPanel.class.getName());
     /** the tag editor model */

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java

@@ -37 +37 @@
  */
 public class AutoCompletionCache {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(AutoCompletionCache.class.getName());