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

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/gui/layer

Files:

• WMSLayer.java (modified) (1 diff)
• geoimage/CorrelateGpxWithImages.java (modified) (5 diffs)

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