Changeset 6792 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-01-31T02:44:56+01:00 (10 years ago)

Author:

Don-vip

Message:

Sonar - fix various issues

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (3 diffs)
• osm/OsmUtils.java (modified) (1 diff)
• validation/tests/WayConnectedToArea.java (modified) (1 diff)

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

@@ -1033 +1033 @@
      *  def otherwise
      */
+    @SuppressWarnings("unchecked")
     synchronized public <T extends Setting> T getSetting(String key, T def, Class<T> klass) {
         CheckParameterUtil.ensureParameterNotNull(key);
@@ -1045 +1046 @@
         Setting prop = settingsMap.get(key);
         if (klass.isInstance(prop)) {
-            @SuppressWarnings("unchecked")
-            T prop_cast = (T) prop;
-            return prop_cast;
+            return (T) prop;
         } else {
             return def;
@@ -1075 +1074 @@
      * If not a single entry could be found, <code>def</code> is returned.
      */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     synchronized public Collection<Collection<String>> getArray(String key, Collection<Collection<String>> def) {
         ListListSetting val = getSetting(key, ListListSetting.create(def), ListListSetting.class);
-        @SuppressWarnings({ "unchecked", "rawtypes" })
-        Collection<Collection<String>> val_cast = (Collection) val.getValue();
-        return val_cast;
+        return (Collection) val.getValue();
     }
 

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

@@ -8 +8 @@
 
 public final class OsmUtils {
-    
+
     private OsmUtils() {
         // Hide default constructor for utils classes
     }
 
-    static List<String> TRUE_VALUES = new ArrayList<String>(Arrays
+    static final List<String> TRUE_VALUES = new ArrayList<String>(Arrays
             .asList(new String[] { "true", "yes", "1", "on" }));
-    static List<String> FALSE_VALUES = new ArrayList<String>(Arrays
+    static final List<String> FALSE_VALUES = new ArrayList<String>(Arrays
             .asList(new String[] { "false", "no", "0", "off" }));
-    static List<String> REVERSE_VALUES = new ArrayList<String>(Arrays
+    static final List<String> REVERSE_VALUES = new ArrayList<String>(Arrays
             .asList(new String[] { "reverse", "-1" }));
 

trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java

@@ -67 +67 @@
     private void testForError(Way w, Node wayNode, OsmPrimitive p) {
         if (wayNode.isOutsideDownloadArea()) {
+            return;
         } else if (Utils.exists(wayNode.getReferrers(), Predicates.hasTag("route", "ferry"))) {
+            return;
         } else if (isArea(p)) {
             addError(w, wayNode, p);