Changeset 6792 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

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

Author:

Don-vip

Message:

Sonar - fix various issues

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)

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();
     }