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

Timestamp:

2013-09-08T05:51:16+02:00 (12 years ago)

Author:

Don-vip

Message:

Sonar - fix various violations

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• help/HelpBrowserHistory.java (modified) (1 diff)
• history/HistoryBrowserDialogManager.java (modified) (1 diff)
• layer/geoimage/CorrelateGpxWithImages.java (modified) (4 diffs)
• preferences/PreferenceTabbedPane.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

@@ -52 +52 @@
         boolean add=true;
 
-        if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url.toString())) {
+        if (historyPos >= 0 && historyPos < history.size() && history.get(historyPos).equals(url)) {
             add = false;
         } else if (historyPos == history.size() -1) {

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

@@ -188 +188 @@
         @Override
         public boolean evaluate(OsmPrimitive p) {
-            if (hds.getHistory(p.getPrimitiveId()) == null)
+            History h = hds.getHistory(p.getPrimitiveId());
+            if (h == null)
                 // reload if the history is not in the cache yet
                 return true;
-            else if (!p.isNew() && hds.getHistory(p.getPrimitiveId()).getByVersion(p.getUniqueId()) == null)
+            else if (!p.isNew() && h.getByVersion(p.getUniqueId()) == null)
                 // reload if the history object of the selected object is not in the cache yet
                 return true;

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

@@ -33 +33 @@
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
@@ -73 +74 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.tools.ExifReader;
@@ -79 +81 @@
 import org.openstreetmap.josm.tools.PrimaryDateParser;
 import org.xml.sax.SAXException;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /** This class displays the window to select the GPX file and the offset (timezone + delta).
@@ -881 +882 @@
             final JSlider sldTimezone = new JSlider(-24, 24, 0);
             sldTimezone.setPaintLabels(true);
-            Hashtable<Integer,JLabel> labelTable = new Hashtable<Integer, JLabel>();
+            Dictionary<Integer,JLabel> labelTable = new Hashtable<Integer, JLabel>();
             labelTable.put(-24, new JLabel("-12:00"));
             labelTable.put(-12, new JLabel( "-6:00"));

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

@@ -201 +201 @@
             @Override
             public boolean identify(TabPreferenceSetting tps, Object name) {
-                return name != null && tps != null && tps.getIconName() != null && tps.getIconName().equals(name);
+                return name != null && tps != null && tps.getIconName() != null && name.equals(tps.getIconName());
             }}, name);
     }