Changeset 8338 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-05-07T01:27:41+02:00 (10 years ago)

Author:

Don-vip

Message:

fix squid:S1319 - Declarations should use Java collection interfaces rather than specific implementation classes

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• OsmUrlToBounds.java (modified) (1 diff)
• Pair.java (modified) (3 diffs)
• Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -42 +42 @@
         }
         String[] args = url.substring(i+1).split("&");
-        HashMap<String, String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>();
         for (String arg : args) {
             int eq = arg.indexOf('=');

trunk/src/org/openstreetmap/josm/tools/Pair.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
@@ -31 +32 @@
     }
 
-    @Override public int hashCode() {
+    @Override
+    public int hashCode() {
         return a.hashCode() + b.hashCode();
     }
 
-    @Override public boolean equals(Object other) {
+    @Override
+    public boolean equals(Object other) {
         if (other instanceof Pair<?, ?>) {
             Pair<?, ?> o = (Pair<?, ?>)other;
@@ -43 +46 @@
     }
 
-    public static <T> ArrayList<T> toArrayList(Pair<T, T> p) {
-        ArrayList<T> l = new ArrayList<>(2);
+    public static <T> List<T> toList(Pair<T, T> p) {
+        List<T> l = new ArrayList<>(2);
         l.add(p.a);
         l.add(p.b);

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -310 +310 @@
         Main.platform.initSystemShortcuts();
         // (2) User defined shortcuts
-        LinkedList<Shortcut> newshortcuts = new LinkedList<>();
+        List<Shortcut> newshortcuts = new LinkedList<>();
         for(String s : Main.pref.getAllPrefixCollectionKeys("shortcut.entry.")) {
             newshortcuts.add(new Shortcut(s));