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

Timestamp:

2013-08-11T21:23:19+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - fix compilation warnings

File:

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

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

@@ -1288 +1288 @@
                 changed = putListOfStructs(key, setting.getValue());
             }
-        };
+        }
         PutVisitor putVisitor = new PutVisitor();
         value.visit(putVisitor);
@@ -1669 +1669 @@
     }
 
-    public static boolean isEqual(Setting a, Setting b) {
+    public static boolean isEqual(Setting<?> a, Setting<?> b) {
         if (a==null && b==null) return true;
         if (a==null) return false;
@@ -1678 +1678 @@
             return (a.getValue().equals(b.getValue()));
         if (a instanceof ListSetting) {
-            @SuppressWarnings("unchecked") Collection<String> aValue = (Collection) a.getValue();
-            @SuppressWarnings("unchecked") Collection<String> bValue = (Collection) b.getValue();
+            @SuppressWarnings("unchecked") Collection<String> aValue = (Collection<String>) a.getValue();
+            @SuppressWarnings("unchecked") Collection<String> bValue = (Collection<String>) b.getValue();
             return equalCollection(aValue, bValue);
         }
         if (a instanceof ListListSetting) {
-            @SuppressWarnings("unchecked") Collection<Collection<String>> aValue = (Collection) a.getValue();
-            @SuppressWarnings("unchecked") Collection<List<String>> bValue = (Collection) b.getValue();
+            @SuppressWarnings("unchecked") Collection<Collection<String>> aValue = (Collection<Collection<String>>) a.getValue();
+            @SuppressWarnings("unchecked") Collection<List<String>> bValue = (Collection<List<String>>) b.getValue();
             return equalArray(aValue, bValue);
         }
         if (a instanceof MapListSetting) {
-            @SuppressWarnings("unchecked") Collection<Map<String, String>> aValue = (Collection) a.getValue();
-            @SuppressWarnings("unchecked") Collection<Map<String, String>> bValue = (Collection) b.getValue();
+            @SuppressWarnings("unchecked") Collection<Map<String, String>> aValue = (Collection<Map<String, String>>) a.getValue();
+            @SuppressWarnings("unchecked") Collection<Map<String, String>> bValue = (Collection<Map<String, String>>) b.getValue();
             return equalListOfStructs(aValue, bValue);
         }