Ignore:
Timestamp:
2015-05-07T01:27:41+02:00 (5 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/io
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/CacheFiles.java

    r8308 r8338  
    1010import java.util.Iterator;
    1111import java.util.Set;
     12import java.util.SortedMap;
    1213import java.util.TreeMap;
    1314
     
    245246        if(!this.enabled || maxsize == -1) return;
    246247
    247         TreeMap<Long, File> modtime = new TreeMap<>();
     248        SortedMap<Long, File> modtime = new TreeMap<>();
    248249        long dirsize = 0;
    249250
  • trunk/src/org/openstreetmap/josm/io/Capabilities.java

    r8287 r8338  
    5151public class Capabilities {
    5252
    53     private final Map<String, HashMap<String,String>> capabilities;
     53    private final Map<String, Map<String,String>> capabilities;
    5454    private final List<String> imageryBlacklist;
    5555
     
    7171    public boolean isDefined(String element, String attribute) {
    7272        if (! capabilities.containsKey(element)) return false;
    73         HashMap<String, String> e = capabilities.get(element);
     73        Map<String, String> e = capabilities.get(element);
    7474        if (e == null) return false;
    7575        return (e.get(attribute) != null);
     
    8585    public String get(String element, String attribute) {
    8686        if (! capabilities.containsKey(element)) return null;
    87         HashMap<String, String> e = capabilities.get(element);
     87        Map<String, String> e = capabilities.get(element);
    8888        if (e == null) return null;
    8989        return e.get(attribute);
     
    132132        } else {
    133133            if (! capabilities.containsKey(element))  {
    134                 HashMap<String,String> h = new HashMap<>();
     134                Map<String,String> h = new HashMap<>();
    135135                capabilities.put(element, h);
    136136            }
    137             HashMap<String, String> e = capabilities.get(element);
     137            Map<String, String> e = capabilities.get(element);
    138138            e.put(attribute, value);
    139139        }
  • trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

    r8291 r8338  
    239239     */
    240240    protected Set<Long> extractIdPackage(Set<Long> ids) {
    241         HashSet<Long> pkg = new HashSet<>();
     241        Set<Long> pkg = new HashSet<>();
    242242        if (ids.isEmpty())
    243243            return pkg;
  • trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

    r7937 r8338  
    233233        ImageryInfo i = new ImageryInfo(name, buildGetMapUrl(selectedLayers));
    234234        if (selectedLayers != null) {
    235             HashSet<String> proj = new HashSet<>();
     235            Set<String> proj = new HashSet<>();
    236236            for (WMSImagery.LayerDetails l : selectedLayers) {
    237237                proj.addAll(l.getProjections());
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

    r8318 r8338  
    1313import java.util.List;
    1414import java.util.Map;
     15import java.util.Set;
    1516
    1617import javax.swing.JLabel;
     
    228229            }
    229230        }
    230         HashSet<String> knownParams = new HashSet<>();
     231        Set<String> knownParams = new HashSet<>();
    231232        if (mandatory != null) Collections.addAll(knownParams, mandatory);
    232233        if (optional != null) Collections.addAll(knownParams, optional);
     
    316317        @Override
    317318        protected void parseArgs() {
    318             HashMap<String, String> args = new HashMap<>();
     319            Map<String, String> args = new HashMap<>();
    319320            if (request.indexOf('?') != -1) {
    320321                String query = request.substring(request.indexOf('?') + 1);
Note: See TracChangeset for help on using the changeset viewer.