Changeset 6246 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-09-22T18:36:07+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - various bugfixes / violation fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInLineAction.java (modified) (1 diff)
• actions/AutoScaleAction.java (modified) (3 diffs)
• actions/JoinAreasAction.java (modified) (2 diffs)
• actions/JumpToAction.java (modified) (3 diffs)
• actions/MapRectifierWMSmenuAction.java (moved) (moved from trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java ) (2 diffs)
• actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/ParallelWayAction.java (modified) (2 diffs)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• command/RotateCommand.java (modified) (2 diffs)
• data/Version.java (modified) (1 diff)
• data/gpx/WayPoint.java (modified) (1 diff)
• data/osm/AbstractPrimitive.java (modified) (1 diff)
• data/osm/WaySegment.java (modified) (1 diff)
• data/validation/OsmValidator.java (modified) (1 diff)
• gui/ImageryMenu.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (1 diff)
• gui/MapFrame.java (modified) (1 diff)
• gui/MenuScroller.java (modified) (2 diffs)
• gui/OsmPrimitivRenderer.java (modified) (2 diffs)
• gui/SideButton.java (modified) (4 diffs)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (2 diffs)
• gui/bbox/TileSelectionBBoxChooser.java (modified) (3 diffs)
• gui/dialogs/DialogsPanel.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (3 diffs)
• gui/dialogs/relation/MemberRoleCellEditor.java (modified) (1 diff)
• gui/history/TwoColumnDiff.java (modified) (2 diffs)
• gui/layer/WMSLayer.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (5 diffs)
• gui/mappaint/xml/XmlStyleSourceHandler.java (modified) (12 diffs)
• gui/preferences/advanced/AdvancedPreference.java (modified) (1 diff)
• gui/preferences/display/LafPreference.java (modified) (1 diff)
• gui/preferences/map/MapPaintPreference.java (modified) (1 diff)
• gui/preferences/map/TaggingPresetPreference.java (modified) (1 diff)
• gui/preferences/projection/CodeProjectionChoice.java (modified) (1 diff)
• gui/preferences/projection/LambertProjectionChoice.java (modified) (2 diffs)
• gui/preferences/projection/ProjectionPreference.java (modified) (1 diff)
• gui/preferences/projection/UTMFranceDOMProjectionChoice.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java ) (2 diffs)
• gui/preferences/shortcut/ShortcutPreference.java (modified) (2 diffs)
• gui/tagging/TaggingPresetItems.java (modified) (4 diffs)
• gui/tagging/TaggingPresetMenu.java (modified) (1 diff)
• io/GeoJSONWriter.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (1 diff)
• tools/AudioPlayer.java (modified) (1 diff)
• tools/Diff.java (modified) (27 diffs)
• tools/Geometry.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (2 diffs)
• tools/TextTagParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -132 +132 @@
             if(selectedWays.size() == 1) {
                 w = selectedWays.iterator().next();
-                if(w.containsNode(n) == false)
+                if (!w.containsNode(n))
                     // warning
                     return;

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -38 +40 @@
 public class AutoScaleAction extends JosmAction {
 
-    public static final String[] MODES = {
+    public static final Collection<String> MODES = Collections.unmodifiableList(Arrays.asList(
         marktr("data"),
         marktr("layer"),
@@ -46 +48 @@
         marktr("problem"),
         marktr("previous"),
-        marktr("next")};
+        marktr("next")));
 
     private final String mode;

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -63 +63 @@
     public static class JoinAreasResult {
 
-        public boolean mergeSuccessful;
         public boolean hasChanges;
-        public boolean hasRelationProblems;
 
         public List<Multipolygon> polygons;
@@ -539 +537 @@
 
         result.hasChanges = true;
-        result.mergeSuccessful = true;
         result.polygons = polygons;
         return result;

trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

@@ -64 +64 @@
                   BorderLayout.NORTH);
 
-        class osmURLListener implements DocumentListener {
+        class OsmURLListener implements DocumentListener {
             @Override public void changedUpdate(DocumentEvent e) { parseURL(); }
             @Override public void insertUpdate(DocumentEvent e) { parseURL(); }
@@ -70 +70 @@
         }
 
-        class osmLonLatListener implements DocumentListener {
+        class OsmLonLatListener implements DocumentListener {
             @Override public void changedUpdate(DocumentEvent e) { updateUrl(false); }
             @Override public void insertUpdate(DocumentEvent e) { updateUrl(false); }
@@ -76 +76 @@
         }
 
-        osmLonLatListener x=new osmLonLatListener();
+        OsmLonLatListener x = new OsmLonLatListener();
         lat.getDocument().addDocumentListener(x);
         lon.getDocument().addDocumentListener(x);
         zm.getDocument().addDocumentListener(x);
-        url.getDocument().addDocumentListener(new osmURLListener());
+        url.getDocument().addDocumentListener(new OsmURLListener());
 
         JPanel p = new JPanel(new GridBagLayout());

trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
-public class Map_Rectifier_WMSmenuAction extends JosmAction {
+public class MapRectifierWMSmenuAction extends JosmAction {
     /**
      * Class that bundles all required information of a rectifier service
@@ -65 +65 @@
     public ArrayList<RectifierService> services = new ArrayList<RectifierService>();
 
-    public Map_Rectifier_WMSmenuAction() {
+    public MapRectifierWMSmenuAction() {
         super(tr("Rectified Image..."),
                 "OLmarker",

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -161 +161 @@
             boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false);
             Layer active = Main.map.mapView.getActiveLayer();
-            if (active != null && active instanceof GpxLayer && (merge || ((GpxLayer)active).data.fromServer))
+            if (active instanceof GpxLayer && (merge || ((GpxLayer)active).data.fromServer))
                 return (GpxLayer) active;
             for (GpxLayer l : Main.map.mapView.getLayersOfType(GpxLayer.class)) {

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -179 +179 @@
 
         // update selection to reflect which way being modified
-        if (currentBaseNode != null && getCurrentDataSet() != null && getCurrentDataSet().getSelected().isEmpty() == false) {
+        if (currentBaseNode != null && getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty()) {
             Way continueFrom = getWayForNode(currentBaseNode);
             if (alt && continueFrom != null && (!currentBaseNode.isSelected() || continueFrom.isSelected())) {

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -310 +310 @@
             return;
 
-        if(sanityCheck() == false)
+        if (!sanityCheck())
             return;
 
@@ -586 +586 @@
     }
 
-    private String getStringPref(String subKey) {
-        return getStringPref(subKey, null);
-    }
-
     @Override
     public void preferenceChanged(PreferenceChangeEvent e) {

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -312 +312 @@
                 // only show merge to node cursor if nearby node and that node is currently
                 // not being dragged
-                final boolean hasTarget = osm != null && osm instanceof Node && !osm.isSelected();
+                final boolean hasTarget = osm instanceof Node && !osm.isSelected();
                 c = hasTarget ? "merge_to_node" : "merge";
                 break;

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -26 +26 @@
 
     /**
-     * World position of the mouse when the user started the command.
-     *
-     */
-    EastNorth startEN = null;
-
-    /**
      * angle of rotation starting click to pivot
      */
@@ -49 +43 @@
 
         pivot = getNodesCenter();
-
-        // We remember the very first position of the mouse for this action.
-        // Note that SelectAction will keep the same ScaleCommand when the user
-        // releases the button and presses it again with the same modifiers.
-        // The very first point of this operation is stored here.
-        startEN   = currentEN;
-
         startAngle = getAngle(currentEN);
         rotationAngle = 0.0;

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -131 +131 @@
         isLocalBuild = false;
         value = properties.get("Is-Local-Build");
-        if (value != null && value.trim().toLowerCase().equals("true"))  {
+        if (value != null && value.trim().equalsIgnoreCase("true"))  {
             isLocalBuild = true;
         }

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -1 @@
-//License: GPLv2 or later
-//Copyright 2007 by Raphael Mack and others
-
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.gpx;
 

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -398 +398 @@
     @Override
     public void setVisible(boolean visible) throws IllegalStateException{
-        if (isNew() && visible == false)
+        if (isNew() && !visible)
             throw new IllegalStateException(tr("A primitive with ID = 0 cannot be invisible."));
         updateFlags(FLAG_VISIBLE, visible);

trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java

@@ -50 +50 @@
 
     @Override public boolean equals(Object o) {
-        return o != null && o instanceof WaySegment
+        return o instanceof WaySegment
             && ((WaySegment) o).way == way
             && ((WaySegment) o).lowerIndex == lowerIndex;

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -84 +84 @@
      */
     @SuppressWarnings("unchecked")
-    public static Class<Test>[] allAvailableTests = new Class[] {
+    private static final Class<Test>[] allAvailableTests = new Class[] {
         DuplicateNode.class, // ID    1 ..   99
         OverlappingWays.class, // ID  101 ..  199

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

@@ -27 +27 @@
 import org.openstreetmap.josm.actions.AddImageryLayerAction;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.Map_Rectifier_WMSmenuAction;
+import org.openstreetmap.josm.actions.MapRectifierWMSmenuAction;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -80 +80 @@
     private JMenuItem singleOffset = new JMenuItem(offsetAction);
     private JMenuItem offsetMenuItem = singleOffset;
-    private Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
+    private MapRectifierWMSmenuAction rectaction = new MapRectifierWMSmenuAction();
 
     public ImageryMenu(JMenu subMenu) {

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

@@ -395 +395 @@
         if ((!args.containsKey(Option.NO_MAXIMIZE) && maximized) || args.containsKey(Option.MAXIMIZE)) {
             if (Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH)) {
-                // Main.debug("Main window maximized");
                 Main.windowState = JFrame.MAXIMIZED_BOTH;
                 mainFrame.setExtendedState(Main.windowState);
@@ -401 +400 @@
                 Main.debug("Main window: maximizing not supported");
             }
-        } else {
-            // Main.debug("Main window not maximized");
-        }
-        if(main.menu.fullscreenToggleAction != null) {
+        }
+        if (main.menu.fullscreenToggleAction != null) {
             main.menu.fullscreenToggleAction.initial();
         }

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

@@ -329 +329 @@
     public final JMenu helpMenu = addMenu(marktr("Help"), KeyEvent.VK_H, 11, ht("/Menu/Help"));
 
-    private final int defaultMenuPos = 11;
+    private static final int defaultMenuPos = 11;
 
     public final JosmAction moveUpAction = new MoveAction(MoveAction.Direction.UP);

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

@@ -429 +429 @@
          */
         sideToolBar.setComponentPopupMenu(new JPopupMenu() {
-            final int staticMenuEntryCount = 2;
+            static final int staticMenuEntryCount = 2;
             JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
                 @Override

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

@@ -1 +1 @@
 /**
- * @(#)MenuScroller.java    1.5.0 04/02/12
+ * MenuScroller.java    1.5.0 04/02/12
  * License: use / modify without restrictions (see http://tips4java.wordpress.com/about/)
  */
@@ -438 +438 @@
      */
     @Override
-    public void finalize() throws Throwable {
+    protected void finalize() throws Throwable {
         dispose();
     }

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

@@ -70 +70 @@
      */
     private Component renderer(Component def, OsmPrimitive value) {
-        if (def != null && value != null && def instanceof JLabel) {
+        if (value != null && def instanceof JLabel) {
             ((JLabel)def).setText(getComponentText(value));
             ImageIcon icon = ImageProvider.get(value.getDisplayType());
@@ -91 +91 @@
      */
     private Component renderer(Component def, HistoryOsmPrimitive value) {
-        if (def != null && value != null && def instanceof JLabel) {
+        if (value != null && def instanceof JLabel) {
             ((JLabel)def).setText(value.getDisplayName(DefaultNameFormatter.getInstance()));
             ((JLabel)def).setIcon(ImageProvider.get(value.getType()));

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

@@ -29 +29 @@
     private PropertyChangeListener propertyChangeListener;
 
-    public SideButton(Action action)
-    {
+    public SideButton(Action action) {
         super(action);
         fixIcon(action);
@@ -36 +35 @@
     }
 
-    public SideButton(Action action, boolean usename)
-    {
+    public SideButton(Action action, boolean usename) {
         super(action);
         if(!usename) {
@@ -46 +44 @@
     }
 
-    public SideButton(Action action, String imagename)
-    {
+    public SideButton(Action action, String imagename) {
         super(action);
         setIcon(makeIcon(imagename));
@@ -67 +64 @@
         }
         Icon i = getIcon();
-        if (i != null && i instanceof ImageIcon && i.getIconHeight() != iconHeight) {
+        if (i instanceof ImageIcon && i.getIconHeight() != iconHeight) {
             setIcon(getScaledImage(((ImageIcon) i).getImage()));
         }

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -17 +17 @@
 import java.util.HashSet;
 import java.util.List;
-import java.util.Vector;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -382 +381 @@
         MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
 
-        Vector<MapMarker> marker = new Vector<MapMarker>(2);
+        List<MapMarker> marker = new ArrayList<MapMarker>(2);
         marker.add(xmin_ymin);
         marker.add(xmax_ymax);

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -21 +21 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
-import java.util.Vector;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -50 +51 @@
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /**
@@ -156 +157 @@
         MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
 
-        Vector<MapMarker> marker = new Vector<MapMarker>(2);
+        List<MapMarker> marker = new ArrayList<MapMarker>(2);
         marker.add(xmin_ymin);
         marker.add(xmax_ymax);

trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

@@ -20 +20 @@
     protected List<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
     protected MultiSplitPane mSpltPane = new MultiSplitPane();
-    final protected int DIVIDER_SIZE = 5;
+    protected static final int DIVIDER_SIZE = 5;
 
     /**

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -236 +236 @@
         public void actionPerformed(ActionEvent e) {
             toggleButtonHook();
-            if(getValue("toolbarbutton") != null && getValue("toolbarbutton") instanceof JButton) {
+            if (getValue("toolbarbutton") instanceof JButton) {
                 ((JButton) getValue("toolbarbutton")).setSelected(!isShowing);
             }
@@ -255 +255 @@
                 showNotify();
             }
-        }
-
-        @Override
-        public void destroy() {
-            super.destroy();
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -822 +822 @@
                         ++cnt;
                     } else if (cnt == 0) {
-                        positionString += "," + String.valueOf(cur);
+                        positionString += "," + cur;
                     } else {
-                        positionString += "-" + String.valueOf(last);
-                        positionString += "," + String.valueOf(cur);
+                        positionString += "-" + last;
+                        positionString += "," + cur;
                         cnt = 0;
                     }
@@ -831 +831 @@
                 }
                 if (cnt >= 1) {
-                    positionString += "-" + String.valueOf(last);
+                    positionString += "-" + last;
                 }
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -38 +38 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 
 import javax.swing.AbstractAction;
@@ -374 +373 @@
                     }
                 }
-                Collection<Command> commands=new Vector<Command>();
+                Collection<Command> commands = new ArrayList<Command>();
                 commands.add(new ChangePropertyCommand(sel, key, null));
                 if (value.equals(tr("<different>"))) {
-                    HashMap<String, Vector<OsmPrimitive>> map=new HashMap<String, Vector<OsmPrimitive>>();
+                    Map<String, ArrayList<OsmPrimitive>> map = new HashMap<String, ArrayList<OsmPrimitive>>();
                     for (OsmPrimitive osm: sel) {
-                        String val=osm.get(key);
-                        if(val != null)
-                        {
+                        String val = osm.get(key);
+                        if (val != null) {
                             if (map.containsKey(val)) {
                                 map.get(val).add(osm);
                             } else {
-                                Vector<OsmPrimitive> v = new Vector<OsmPrimitive>();
+                                ArrayList<OsmPrimitive> v = new ArrayList<OsmPrimitive>();
                                 v.add(osm);
                                 map.put(val, v);
@@ -391 +389 @@
                         }
                     }
-                    for (Map.Entry<String, Vector<OsmPrimitive>> e: map.entrySet()) {
+                    for (Map.Entry<String, ArrayList<OsmPrimitive>> e: map.entrySet()) {
                         commands.add(new ChangePropertyCommand(e.getValue(), newkey, e.getKey()));
                     }

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

@@ -50 +50 @@
     }
 
-    @Override
-    public void cancelCellEditing() {
-        super.cancelCellEditing();
-    }
-
-    @Override
-    public boolean stopCellEditing() {
-        return super.stopCellEditing();
-    }
-
     /** Returns the edit field for this cell editor. */
     public AutoCompletingTextField getEditor() {

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

@@ -65 +65 @@
     private void diff() {
         Diff diff = new Diff(reference, current);
-        Diff.change script = diff.diff_2(false);
+        Diff.Change script = diff.diff_2(false);
         twoColumnDiffFromScript(script, reference, current);
     }
@@ -73 +73 @@
      * This method expands this script into a full two column description.
      */
-    private void twoColumnDiffFromScript(Diff.change script, Object[] a, Object[] b) {
+    private void twoColumnDiffFromScript(Diff.Change script, Object[] a, Object[] b) {
         int ia = 0;
         int ib = 0;

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

@@ -122 +122 @@
 
     protected GeorefImage[][] images;
-    protected final int serializeFormatVersion = 5;
+    protected static final int serializeFormatVersion = 5;
     protected boolean autoDownloadEnabled = true;
     protected boolean autoResolutionEnabled = true;

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

@@ -37 +37 @@
 import java.util.List;
 import java.util.TimeZone;
-import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 
@@ -116 +115 @@
 
     ExtendedDialog syncDialog;
-    Vector<GpxDataWrapper> gpxLst = new Vector<GpxDataWrapper>();
+    List<GpxDataWrapper> gpxLst = new ArrayList<GpxDataWrapper>();
     JPanel outerPanel;
     JosmComboBox cbGpx;
@@ -292 +291 @@
 
             String[] tmp = TimeZone.getAvailableIDs();
-            Vector<String> vtTimezones = new Vector<String>(tmp.length);
+            List<String> vtTimezones = new ArrayList<String>(tmp.length);
 
             for (String tzStr : tmp) {
@@ -904 +903 @@
             // This is called whenever one of the sliders is moved.
             // It updates the labels and also calls the "match photos" code
-            class sliderListener implements ChangeListener {
+            class SliderListener implements ChangeListener {
                 @Override
                 public void stateChanged(ChangeEvent e) {
@@ -970 +969 @@
 
             // Call the sliderListener once manually so labels get adjusted
-            new sliderListener().stateChanged(null);
+            new SliderListener().stateChanged(null);
             // Listeners added here, otherwise it tries to match three times
             // (when setting the default values)
-            sldTimezone.addChangeListener(new sliderListener());
-            sldMinutes.addChangeListener(new sliderListener());
-            sldSeconds.addChangeListener(new sliderListener());
+            sldTimezone.addChangeListener(new SliderListener());
+            sldMinutes.addChangeListener(new SliderListener());
+            sldSeconds.addChangeListener(new SliderListener());
 
             // There is no way to cancel this dialog, all changes get applied

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java

@@ -31 +31 @@
         AreaPrototype area = new AreaPrototype();
         IconPrototype icon = new IconPrototype();
-        public void init()
-        {
+        public void init() {
             conditions = null;
             scaleMax = Double.POSITIVE_INFINITY;
@@ -50 +49 @@
     }
 
-    Color convertColor(String colString)
-    {
+    Color convertColor(String colString) {
         int i = colString.indexOf('#');
         Color ret;
@@ -80 +78 @@
 
     private void startElementLine(String qName, Attributes atts, LinePrototype line) {
-        for (int count=0; count<atts.getLength(); count++)
-        {
-            if(atts.getQName(count).equals("width"))
-            {
+        for (int count=0; count<atts.getLength(); count++) {
+            if(atts.getQName(count).equals("width")) {
                 String val = atts.getValue(count);
                 if (! (val.startsWith("+") || val.startsWith("-") || val.endsWith("%"))) {
                     line.setWidth(Integer.parseInt(val));
                 }
-            }
-            else if (atts.getQName(count).equals("colour")) {
+            } else if (atts.getQName(count).equals("colour")) {
                 line.color=convertColor(atts.getValue(count));
             } else if (atts.getQName(count).equals("realwidth")) {
@@ -122 +117 @@
     private void startElementLinemod(String qName, Attributes atts, LinemodPrototype line) {
         startElementLine(qName, atts, line);
-        for (int count=0; count<atts.getLength(); count++)
-        {
-            if(atts.getQName(count).equals("width"))
-            {
+        for (int count=0; count<atts.getLength(); count++) {
+            if (atts.getQName(count).equals("width")) {
                 String val = atts.getValue(count);
-                if(val.startsWith("+"))
-                {
+                if (val.startsWith("+")) {
                     line.setWidth(Integer.parseInt(val.substring(1)));
                     line.widthMode = LinemodPrototype.WidthMode.OFFSET;
-                }
-                else if(val.startsWith("-"))
-                {
+                } else if(val.startsWith("-")) {
                     line.setWidth(Integer.parseInt(val));
                     line.widthMode = LinemodPrototype.WidthMode.OFFSET;
-                }
-                else if(val.endsWith("%"))
-                {
+                } else if(val.endsWith("%")) {
                     line.setWidth(Integer.parseInt(val.substring(0, val.length()-1)));
                     line.widthMode = LinemodPrototype.WidthMode.PERCENT;
@@ -151 +139 @@
 
     @Override public void startElement(String uri,String name, String qName, Attributes atts) {
-        if (inDoc==true)
-        {
+        if (inDoc) {
             if (qName.equals("rule")) {
                 inRule=true;
-            } else if (qName.equals("rules"))
-            {
+            } else if (qName.equals("rules")) {
                 if (style.name == null) {
                     style.name = atts.getValue("name");
@@ -166 +152 @@
                     style.icon = atts.getValue("icon");
                 }
-            }
-            else if (qName.equals("scale_max")) {
+            } else if (qName.equals("scale_max")) {
                 inScaleMax = true;
             } else if (qName.equals("scale_min")) {
                 inScaleMin = true;
-            } else if (qName.equals("condition") && inRule)
-            {
+            } else if (qName.equals("condition") && inRule) {
                 inCondition=true;
                 XmlCondition c = rule.cond;
-                if(c.key != null)
-                {
+                if (c.key != null) {
                     if(rule.conditions == null) {
                         rule.conditions = new LinkedList<XmlCondition>();
@@ -184 +167 @@
                     rule.conditions.add(c);
                 }
-                for (int count=0; count<atts.getLength(); count++)
-                {
-                    if(atts.getQName(count).equals("k")) {
+                for (int count=0; count<atts.getLength(); count++) {
+                    if (atts.getQName(count).equals("k")) {
                         c.key = atts.getValue(count);
-                    } else if(atts.getQName(count).equals("v")) {
+                    } else if (atts.getQName(count).equals("v")) {
                         c.value = atts.getValue(count);
                     } else if(atts.getQName(count).equals("b")) {
@@ -199 +181 @@
                     error("The condition has no key!");
                 }
-            }
-            else if (qName.equals("line"))
-            {
+            } else if (qName.equals("line")) {
                 hadLine = inLine = true;
                 startElementLine(qName, atts, rule.line);
-            }
-            else if (qName.equals("linemod"))
-            {
+            } else if (qName.equals("linemod")) {
                 hadLineMod = inLineMod = true;
                 startElementLinemod(qName, atts, rule.linemod);
-            }
-            else if (qName.equals("icon"))
-            {
+            } else if (qName.equals("icon")) {
                 inIcon = true;
-                for (int count=0; count<atts.getLength(); count++)
-                {
+                for (int count=0; count<atts.getLength(); count++) {
                     if (atts.getQName(count).equals("src")) {
                         IconReference icon = new IconReference(atts.getValue(count), style);
@@ -227 +202 @@
                     }
                 }
-            }
-            else if (qName.equals("area"))
-            {
+            } else if (qName.equals("area")) {
                 hadArea = inArea = true;
                 for (int count=0; count<atts.getLength(); count++)
@@ -251 +224 @@
     @Override public void endElement(String uri,String name, String qName)
     {
-        if (inRule && qName.equals("rule"))
-        {
-            if(hadLine)
+        if (inRule && qName.equals("rule")) {
+            if (hadLine) {
+                style.add(rule.cond, rule.conditions,
+                        new LinePrototype(rule.line, new Range(rule.scaleMin, rule.scaleMax)));
+            }
+            if (hadLineMod)
             {
                 style.add(rule.cond, rule.conditions,
-                        new LinePrototype(rule.line, new Range(rule.scaleMin, rule.scaleMax)));
-            }
-            if(hadLineMod)
+                        new LinemodPrototype(rule.linemod, new Range(rule.scaleMin, rule.scaleMax)));
+            }
+            if (hadIcon)
             {
                 style.add(rule.cond, rule.conditions,
-                        new LinemodPrototype(rule.linemod, new Range(rule.scaleMin, rule.scaleMax)));
-            }
-            if(hadIcon)
-            {
-                style.add(rule.cond, rule.conditions,
                         new IconPrototype(rule.icon, new Range(rule.scaleMin, rule.scaleMax)));
             }
-            if(hadArea)
+            if (hadArea)
             {
                 style.add(rule.cond, rule.conditions,
@@ -276 +247 @@
             hadLine = hadLineMod = hadIcon = hadArea = false;
             rule.init();
-        }
-        else if (inCondition && qName.equals("condition")) {
+        } else if (inCondition && qName.equals("condition")) {
             inCondition = false;
         } else if (inLine && qName.equals("line")) {
@@ -294 +264 @@
     }
 
-    @Override public void characters(char[] ch, int start, int length)
-    {
-        if (inScaleMax == true) {
+    @Override public void characters(char[] ch, int start, int length) {
+        if (inScaleMax) {
             rule.scaleMax = Long.parseLong(new String(ch, start, length));
-        } else if (inScaleMin == true) {
+        } else if (inScaleMin) {
             rule.scaleMin = Long.parseLong(new String(ch, start, length));
         }

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -332 +332 @@
                         +"</html>", null, "")) {
                     Main.pref.resetToDefault();
-                    try { Main.pref.save(); } catch (IOException ex) {}
+                    try {
+                        Main.pref.save();
+                    } catch (IOException e) {
+                        Main.warn("IOException while saving preferences: "+e.getMessage());
+                    }
                     readPreferences(Main.pref);
                     applyFilter();

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -63 +63 @@
         } catch (Exception ex) {
             // just ignore, Quaqua may not even be installed...
-            //System.out.println("Failed to load Quaqua: " + ex);
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -86 +86 @@
     static class MapPaintSourceEditor extends SourceEditor {
 
-        final private String iconpref = "mappaint.icon.sources";
+        private static final String iconpref = "mappaint.icon.sources";
 
         public MapPaintSourceEditor() {

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -187 +187 @@
     static class TaggingPresetSourceEditor extends SourceEditor {
 
-        final private String iconpref = "taggingpreset.icon.sources";
+        private static final String iconpref = "taggingpreset.icon.sources";
 
         public TaggingPresetSourceEditor() {

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

@@ -50 +50 @@
         List<String> data;
         List<String> filteredData;
-        final String DEFAULT_CODE = "EPSG:3857";
+        static final String DEFAULT_CODE = "EPSG:3857";
         String lastCode = DEFAULT_CODE;
         ActionListener listener;

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java

@@ -16 +16 @@
 public class LambertProjectionChoice extends ListProjectionChoice {
 
-    public static String[] lambert4zones = {
+    private static final String[] lambert4zones = {
         tr("{0} ({1} to {2} degrees)", 1,"51.30","48.15"),
         tr("{0} ({1} to {2} degrees)", 2,"48.15","45.45"),
@@ -23 +23 @@
     };
 
+    /**
+     * Constructs a new {@code LambertProjectionChoice}.
+     */
     public LambertProjectionChoice() {
         super(tr("Lambert 4 Zones (France)"), "core:lambert", lambert4zones, tr("Lambert CC Zone"));

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

@@ -175 +175 @@
          * Using the UTM transvers Mercator projection and specific geodesic settings.
          */
-        registerProjectionChoice(utm_france_dom = new UTM_France_DOM_ProjectionChoice());                            // FR
+        registerProjectionChoice(utm_france_dom = new UTMFranceDOMProjectionChoice());                            // FR
 
         /**

trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java

@@ -7 +7 @@
 import java.util.Collections;
 
-public class UTM_France_DOM_ProjectionChoice extends ListProjectionChoice {
+public class UTMFranceDOMProjectionChoice extends ListProjectionChoice {
 
     private final static String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949");
@@ -23 +23 @@
     private final static Integer[] utmEPSGs = { FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG };
 
-    public UTM_France_DOM_ProjectionChoice() {
+    /**
+     * Constructs a new {@code UTMFranceDOMProjectionChoice}.
+     */
+    public UTMFranceDOMProjectionChoice() {
         super(tr("UTM France (DOM)"), "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system"));
     }

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java

@@ -41 +41 @@
         JPanel p = gui.createPreferenceTab(this);
 
-        PrefJPanel prefpanel = new PrefJPanel(new scListModel());
+        PrefJPanel prefpanel = new PrefJPanel(new ScListModel());
         p.add(prefpanel, GBC.eol().fill(GBC.BOTH));
         if (defaultFilter!=null) prefpanel.filter(defaultFilter);
@@ -56 +56 @@
 
     // Maybe move this to prefPanel? There's no need for it to be here.
-    private static class scListModel extends AbstractTableModel {
+    private static class ScListModel extends AbstractTableModel {
         private String[] columnNames = new String[]{tr("Action"), tr("Shortcut")};
         private List<Shortcut> data;
 
-        public scListModel() {
+        public ScListModel() {
             data = Shortcut.listAll();
         }

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

@@ -204 +204 @@
             String cstring;
             if(count > 0 && !required) {
-                cstring = "0,"+String.valueOf(count);
+                cstring = "0,"+count;
             } else if(count > 0) {
                 cstring = String.valueOf(count);
@@ -1010 +1010 @@
         }
 
-        protected String getDisplayIfNull(String display) {
-            return display;
+        protected String getDisplayIfNull() {
+            return null;
         }
 
@@ -1020 +1020 @@
             String value = null;
             if (display == null) {
-                display = getDisplayIfNull(display);
+                display = getDisplayIfNull();
             }
 
@@ -1208 +1208 @@
 
         @Override
-        protected String getDisplayIfNull(String display) {
+        protected String getDisplayIfNull() {
             if (combo.isEditable())
                 return combo.getEditor().getItem().toString();
             else
-                return display;
-
+                return null;
         }
     }

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

@@ -31 +31 @@
                     tr("Preset group {0}", getLocaleName())));
         putValue("toolbar", "tagginggroup_" + getRawName());
-    }
-    
-    @Override
-    public void setIcon(String iconName) {
-        super.setIcon(iconName);
     }
 

trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java

@@ -17 +17 @@
     private OsmDataLayer layer;
     private StringBuilder out;
-    private final boolean skipEmptyNodes = true;
+    private static final boolean skipEmptyNodes = true;
     private boolean insertComma = false;
 

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -146 +146 @@
 
                 return FixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
-            } catch(Exception e) {
-                if (e instanceof OsmTransferException)
-                    throw (OsmTransferException)e;
-                else
-                    throw new OsmTransferException(e);
+            } catch (OsmTransferException e) {
+                throw e;
+            } catch (Exception e) {
+                throw new OsmTransferException(e);
             }
         } finally {

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -305 +305 @@
                                         bytesToSkip -= nBytesRead;
                                     }
-                                    if (bytesToSkip > 0) {
-                                        audioInputStream.skip(bytesToSkip);
+                                    while (bytesToSkip > 0) {
+                                        long skippedBytes = audioInputStream.skip(bytesToSkip);
+                                        bytesToSkip -= skippedBytes;
+                                        if (skippedBytes == 0) {
+                                            // Avoid inifinite loop
+                                            Main.warn("Unable to skip bytes from audio input stream");
+                                            bytesToSkip = 0;
+                                        }
                                     }
                                     position = offset;

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -97 +97 @@
     public Diff(Object[] a,Object[] b) {
         Map<Object,Integer> h = new HashMap<Object,Integer>(a.length + b.length);
-        filevec = new file_data[] { new file_data(a,h),new file_data(b,h) };
+        filevec = new FileData[] { new FileData(a,h),new FileData(b,h) };
     }
 
@@ -123 +123 @@
                    search of the edit matrix. */
     private int fdiagoff, bdiagoff;
-    private final file_data[] filevec;
+    private final FileData[] filevec;
     private int cost;
     /** Snakes bigger than this are considered "big". */
@@ -358 +358 @@
                 filevec[0].changed_flag[1+filevec[0].realindexes[xoff++]] = true;
             }
-        } else
-        {
+        } else {
             /* Find a point of correspondence in the middle of the files.  */
 
@@ -378 +377 @@
                 compareseq (xoff, b, yoff, b - d);
                 /* This used to use f instead of b,
-           but that is incorrect!
-           It is not necessarily the case that diagonal d
-           has a snake from b to f.  */
+                   but that is incorrect!
+                   It is not necessarily the case that diagonal d
+                   has a snake from b to f.  */
                 compareseq (b, xlim, b - d, ylim);
             }
@@ -388 +387 @@
     /** Discard lines from one file that have no matches in the other file.
      */
-
     private void discard_confusing_lines() {
         filevec[0].discard_confusing_lines(filevec[1]);
@@ -397 +395 @@
 
     /** Adjust inserts/deletes of blank lines to join changes
-     as much as possible.
+        as much as possible.
      */
-
     private void shift_boundaries() {
         if (inhibit)
@@ -409 +406 @@
     public interface ScriptBuilder {
         /** Scan the tables of which lines are inserted and deleted,
-     producing an edit script.
-   @param changed0 true for lines in first file which do not match 2nd
-   @param len0 number of lines in first file
-   @param changed1 true for lines in 2nd file which do not match 1st
-   @param len1 number of lines in 2nd file
-   @return a linked list of changes - or null
+            producing an edit script.
+            @param changed0 true for lines in first file which do not match 2nd
+            @param len0 number of lines in first file
+            @param changed1 true for lines in 2nd file which do not match 1st
+            @param len1 number of lines in 2nd file
+            @return a linked list of changes - or null
          */
-        public change build_script(
+        public Change build_script(
                 boolean[] changed0,int len0,
                 boolean[] changed1,int len1
@@ -427 +424 @@
     static class ReverseScript implements ScriptBuilder {
         @Override
-        public  change build_script(
+        public  Change build_script(
                 final boolean[] changed0,int len0,
                 final boolean[] changed1,int len1)
         {
-            change script = null;
+            Change script = null;
             int i0 = 0, i1 = 0;
             while (i0 < len0 || i1 < len1) {
@@ -446 +443 @@
 
                     /* Record this change.  */
-                    script = new change(line0, line1, i0 - line0, i1 - line1, script);
+                    script = new Change(line0, line1, i0 - line0, i1 - line1, script);
                 }
 
@@ -459 +456 @@
     static class ForwardScript implements ScriptBuilder {
         /** Scan the tables of which lines are inserted and deleted,
-       producing an edit script in forward order.  */
+            producing an edit script in forward order.  */
         @Override
-        public change build_script(
+        public Change build_script(
                 final boolean[] changed0,int len0,
                 final boolean[] changed1,int len1)
         {
-            change script = null;
+            Change script = null;
             int i0 = len0, i1 = len1;
 
@@ -483 +480 @@
 
                     /* Record this change.  */
-                    script = new change(i0, i1, line0 - i0, line1 - i1, script);
+                    script = new Change(i0, i1, line0 - i0, line1 - i1, script);
                 }
 
@@ -499 +496 @@
     reverseScript = new ReverseScript();
 
-    /* Report the differences of two files.  DEPTH is the current directory
-     depth. */
-    public final change diff_2(final boolean reverse) {
+    /** Report the differences of two files.  DEPTH is the current directory
+        depth. */
+    public final Change diff_2(final boolean reverse) {
         return diff(reverse ? reverseScript : forwardScript);
     }
@@ -513 +510 @@
      @return the head of a list of changes
      */
-    public change diff(final ScriptBuilder bld) {
+    public Change diff(final ScriptBuilder bld) {
 
         /* Some lines are obviously insertions or deletions
@@ -566 +563 @@
      which the insertion was done; vice versa for INSERTED and LINE1.  */
 
-    public static class change {
+    public static class Change {
         /** Previous or next edit command. */
-        public change link;
+        public Change link;
         /** # lines of file 1 changed here.  */
         public final int inserted;
@@ -577 +574 @@
         /** Line number of 1st inserted line.  */
         public final int line1;
-        /** Change is ignorable. */
-        public boolean ignore;
 
         /** Cons an additional entry onto the front of an edit script OLD.
@@ -587 +582 @@
        If DELETED is 0 then LINE0 is the number of the line before
        which the insertion was done; vice versa for INSERTED and LINE1.  */
-        public change(int line0, int line1, int deleted, int inserted, change old) {
+        public Change(int line0, int line1, int deleted, int inserted, Change old) {
             this.line0 = line0;
             this.line1 = line1;
@@ -604 +599 @@
      */
 
-    class file_data {
+    class FileData {
 
         /** Allocate changed array for the results of comparison.  */
         void clear() {
             /* Allocate a flag for each line of each file, saying whether that line
-     is an insertion or deletion.
-     Allocate an extra element, always zero, at each end of each vector.
+               is an insertion or deletion.
+               Allocate an extra element, always zero, at each end of each vector.
              */
             changed_flag = new boolean[buffered_lines + 2];
@@ -616 +611 @@
 
         /** Return equiv_count[I] as the number of lines in this file
-       that fall in equivalence class I.
+         that fall in equivalence class I.
          @return the array of equivalence class counts.
          */
@@ -640 +635 @@
       @param f the other file
          */
-        void discard_confusing_lines(file_data f) {
+        void discard_confusing_lines(FileData f) {
             clear();
             /* Set up table of which lines are going to be discarded. */
@@ -729 +724 @@
 
                     /* Now we have the length of a run of discardable lines
-           whose first and last are not provisional.  */
+                       whose first and last are not provisional.  */
                     length = j - i;
 
                     /* If 1/4 of the lines in the run are provisional,
-           cancel discarding of all provisional lines in the run.  */
-                    if (provisional * 4 > length)
-                    {
+                       cancel discarding of all provisional lines in the run.  */
+                    if (provisional * 4 > length) {
                         while (j > i)
                             if (discards[--j] == 2) {
                                 discards[j] = 0;
                             }
-                    }
-                    else
-                    {
+                    } else {
                         int consec;
                         int minimum = 1;
@@ -817 +809 @@
 
         /** Actually discard the lines.
-      @param discards flags lines to be discarded
+            @param discards flags lines to be discarded
          */
         private void discard(final byte[] discards) {
@@ -833 +825 @@
         }
 
-        file_data(int[] data) {
+        FileData(int[] data) {
             buffered_lines = data.length;
             equivs = data;
@@ -840 +832 @@
         }
         
-        file_data(Object[] data,Map<Object,Integer> h) {
+        FileData(Object[] data,Map<Object,Integer> h) {
             this(new int[data.length]);
             // FIXME: diff 2.7 removes common prefix and common suffix
@@ -866 +858 @@
          */
 
-        void shift_boundaries(file_data f) {
+        void shift_boundaries(FileData f) {
             final boolean[] changed = changed_flag;
             final boolean[] other_changed = f.changed_flag;
@@ -909 +901 @@
 
                     /* If the first changed line matches the following unchanged one,
-         and this run does not follow right after a previous run,
-         and there are no lines deleted from the other file here,
-         then classify the first changed line as unchanged
-         and the following line as changed in its place.  */
+                       and this run does not follow right after a previous run,
+                       and there are no lines deleted from the other file here,
+                       then classify the first changed line as unchanged
+                       and the following line as changed in its place.  */
 
                     /* You might ask, how could this run follow right after another?
-         Only because the previous run was shifted here.  */
+                       Only because the previous run was shifted here.  */
 
                     if (end != i_end
@@ -929 +921 @@
                         ++i;
                         /* Since one line-that-matches is now before this run
-             instead of after, we must advance in the other file
-             to keep in synch.  */
+                           instead of after, we must advance in the other file
+                           to keep in synch.  */
                         ++j;
                     } else {
@@ -965 +957 @@
            The results of comparison are stored here.  */
         boolean[]       changed_flag;
-
     }
 }

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -181 +181 @@
 
         for (int pos = 0; pos < ways.size(); pos ++) {
-            if (changedWays[pos] == false) {
+            if (!changedWays[pos]) {
                 continue;
             }

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -412 +412 @@
                                     try {
                                         return new ImageResource(ImageIO.read(new ByteArrayInputStream(bytes)));
-                                    } catch (IOException e) {}
+                                    } catch (IOException e) {
+                                        Main.warn("IOException while reading image: "+e.getMessage());
+                                    }
                                 }
                     }
@@ -522 +524 @@
                 try {
                     img = ImageIO.read(is.getFile().toURI().toURL());
-                } catch (IOException e) {}
+                } catch (IOException e) {
+                    Main.warn("IOException while reading HTTP image: "+e.getMessage());
+                }
                 return img == null ? null : new ImageResource(img);
             default:

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -34 +34 @@
     
     public static class TextAnalyzer {
-        int start = 0;
-        boolean keyFound = false;
         boolean quotesStarted = false;
         boolean esc = false;
@@ -42 +40 @@
         String data;
         int n;
-        boolean notFound;
 
         public TextAnalyzer(String text) {