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

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/APIDataSet.java

    r8291 r8338  
    185185     */
    186186    public List<OsmPrimitive> getPrimitives() {
    187         LinkedList<OsmPrimitive> ret = new LinkedList<>();
     187        List<OsmPrimitive> ret = new LinkedList<>();
    188188        ret.addAll(toAdd);
    189189        ret.addAll(toUpdate);
    … …  
    218218     */
    219219    public void adjustRelationUploadOrder() throws CyclicUploadDependencyException{
    220         LinkedList<OsmPrimitive> newToAdd = new LinkedList<>();
     220        List<OsmPrimitive> newToAdd = new LinkedList<>();
    221221        newToAdd.addAll(Utils.filteredCollection(toAdd, Node.class));
    222222        newToAdd.addAll(Utils.filteredCollection(toAdd, Way.class));
    … …  
    231231        toAdd = newToAdd;
    232232
    233         LinkedList<OsmPrimitive> newToDelete = new LinkedList<>();
     233        List<OsmPrimitive> newToDelete = new LinkedList<>();
    234234        graph = new RelationUploadDependencyGraph(Utils.filteredCollection(toDelete, Relation.class), false);
    235235        newToDelete.addAll(graph.computeUploadOrder());

  • trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

    r8308 r8338  
    2121import java.util.Map;
    2222import java.util.Map.Entry;
     23import java.util.Set;
    2324import java.util.SortedMap;
    2425import java.util.TreeMap;
    … …  
    202203     */
    203204    public static void exportPreferencesKeysToFile(String filename, boolean append, String... keys) {
    204         HashSet<String> keySet = new HashSet<>();
     205        Set<String> keySet = new HashSet<>();
    205206        Collections.addAll(keySet, keys);
    206207        exportPreferencesKeysToFile(filename, append, keySet);

  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r8291 r8338  
    320320     */
    321321    public Set<OsmPrimitive> getMyConflictParties() {
    322         HashSet<OsmPrimitive> ret = new HashSet<>();
     322        Set<OsmPrimitive> ret = new HashSet<>();
    323323        for (Conflict<?> c: conflicts) {
    324324            ret.add(c.getMy());
    … …  
    326326        return ret;
    327327    }
     328
    328329    /**
    329330     * Replies the set of  {@link OsmPrimitive} which participate in the role
    … …  
    334335     */
    335336    public Set<OsmPrimitive> getTheirConflictParties() {
    336         HashSet<OsmPrimitive> ret = new HashSet<>();
     337        Set<OsmPrimitive> ret = new HashSet<>();
    337338        for (Conflict<?> c: conflicts) {
    338339            ret.add(c.getTheir());

  • trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

    r7005 r8338  
    8686
    8787    public static void saveBookmarks() {
    88         LinkedList<Collection<String>> coll = new LinkedList<>();
     88        List<Collection<String>> coll = new LinkedList<>();
    8989        for (OffsetBookmark b : allBookmarks) {
    9090            coll.add(b.getInfoArray());

  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

    r7079 r8338  
    4848    private final Map<Integer, Changeset> cache = new HashMap<>();
    4949
    50     private final CopyOnWriteArrayList<ChangesetCacheListener> listeners =
    51         new CopyOnWriteArrayList<>();
     50    private final CopyOnWriteArrayList<ChangesetCacheListener> listeners = new CopyOnWriteArrayList<>();
    5251
    5352    private ChangesetCache() {

  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java

    r8291 r8338  
    116116    public Set<HistoryOsmPrimitive> getPrimitivesByModificationType(ChangesetModificationType cmt) {
    117117        CheckParameterUtil.ensureParameterNotNull(cmt,"cmt");
    118         HashSet<HistoryOsmPrimitive> ret = new HashSet<>();
     118        Set<HistoryOsmPrimitive> ret = new HashSet<>();
    119119        for (Entry<PrimitiveId, ChangesetModificationType> entry: modificationTypes.entrySet()) {
    120120            if (entry.getValue().equals(cmt)) {

  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r8291 r8338  
    729729        boolean changed;
    730730        synchronized (selectionLock) {
    731             LinkedHashSet<OsmPrimitive> oldSelection = new LinkedHashSet<>(selectedPrimitives);
     731            Set<OsmPrimitive> oldSelection = new LinkedHashSet<>(selectedPrimitives);
    732732            selectedPrimitives = new LinkedHashSet<>();
    733733            addSelected(selection, false);
    … …  
    878878        try {
    879879            DataSet ds = new DataSet();
    880             HashMap<OsmPrimitive, OsmPrimitive> primMap = new HashMap<>();
     880            Map<OsmPrimitive, OsmPrimitive> primMap = new HashMap<>();
    881881            for (Node n : nodes) {
    882882                Node newNode = new Node(n);

  • trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

    r8291 r8338  
    264264        if (target == null)
    265265            throw new IllegalStateException(tr("Missing merge target for relation with id {0}", source.getUniqueId()));
    266         LinkedList<RelationMember> newMembers = new LinkedList<>();
     266        List<RelationMember> newMembers = new LinkedList<>();
    267267        for (RelationMember sourceMember : source.getMembers()) {
    268268            OsmPrimitive targetMember = getMergeTarget(sourceMember.getMember());

  • trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

    r8224 r8338  
    77import java.util.Comparator;
    88import java.util.Date;
     9import java.util.List;
    910import java.util.Map;
    1011
    … …  
    113114     */
    114115    public Collection<Note> getSortedNotes() {
    115         final ArrayList<Note> list = new ArrayList<>(noteList);
     116        final List<Note> list = new ArrayList<>(noteList);
    116117        Collections.sort(list, comparator);
    117118        return list;

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r8291 r8338  
    161161     */
    162162    public static Set<OsmPrimitive> getReferrer(Collection<? extends OsmPrimitive> primitives) {
    163         HashSet<OsmPrimitive> ret = new HashSet<>();
     163        Set<OsmPrimitive> ret = new HashSet<>();
    164164        if (primitives == null || primitives.isEmpty()) return ret;
    165165        for (OsmPrimitive p: primitives) {
    … …  
    173173     */
    174174    public static final Predicate<OsmPrimitive> isUsablePredicate = new Predicate<OsmPrimitive>() {
    175         @Override public boolean evaluate(OsmPrimitive primitive) {
     175        @Override
     176        public boolean evaluate(OsmPrimitive primitive) {
    176177            return primitive.isUsable();
    177178        }
    … …  
    179180
    180181    public static final Predicate<OsmPrimitive> isSelectablePredicate = new Predicate<OsmPrimitive>() {
    181         @Override public boolean evaluate(OsmPrimitive primitive) {
     182        @Override
     183        public boolean evaluate(OsmPrimitive primitive) {
    182184            return primitive.isSelectable();
    183185        }
    … …  
    665667    public static Collection<String> getUninterestingKeys() {
    666668        if (uninteresting == null) {
    667             LinkedList<String> l = new LinkedList<>(Arrays.asList(
     669            List<String> l = new LinkedList<>(Arrays.asList(
    668670                "source", "source_ref", "source:", "comment",
    669671                "converted_by", "watch", "watch:",
    … …  
    13641366     */
    13651367    public static Set<Relation> getParentRelations(Collection<? extends OsmPrimitive> primitives) {
    1366         HashSet<Relation> ret = new HashSet<>();
     1368        Set<Relation> ret = new HashSet<>();
    13671369        for (OsmPrimitive w : primitives) {
    13681370            ret.addAll(OsmPrimitive.getFilteredList(w.getReferrers(), Relation.class));

  • trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

    r8318 r8338  
    477477    }
    478478
    479     public ArrayList<T> toArrayList() {
    480         ArrayList<T> a = new ArrayList<>();
     479    public List<T> toList() {
     480        List<T> a = new ArrayList<>();
    481481        for (T n : this) {
    482482            a.add(n);
    … …  
    487487    @Override
    488488    public Object[] toArray() {
    489         return this.toArrayList().toArray();
     489        return this.toList().toArray();
    490490    }
    491491
    492492    @Override
    493493    public <A> A[] toArray(A[] template) {
    494         return this.toArrayList().toArray(template);
     494        return this.toList().toArray(template);
    495495    }
    496496

  • trunk/src/org/openstreetmap/josm/data/osm/Relation.java

    r8291 r8338  
    388388     */
    389389    public Set<OsmPrimitive> getMemberPrimitives() {
    390         HashSet<OsmPrimitive> ret = new HashSet<>();
     390        Set<OsmPrimitive> ret = new HashSet<>();
    391391        RelationMember[] members = this.members;
    392392        for (RelationMember m: members) {

  • trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java

    r8308 r8338  
    9797     */
    9898    public static List<SimplePrimitiveId> fuzzyParse(String s) {
    99         final ArrayList<SimplePrimitiveId> ids = new ArrayList<>();
     99        final List<SimplePrimitiveId> ids = new ArrayList<>();
    100100        final Matcher m = ID_PATTERN.matcher(s);
    101101        while (m.find()) {

  • trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

    r8291 r8338  
    499499     */
    500500    public Set<String> getKeys() {
    501         HashSet<String> ret = new HashSet<>();
     501        Set<String> ret = new HashSet<>();
    502502        for (Tag tag: tags) {
    503503            ret.add(tag.getKey());
    … …  
    512512     */
    513513    public Set<String> getKeysWithMultipleValues() {
    514         HashMap<String, Integer> counters = new HashMap<>();
     514        Map<String, Integer> counters = new HashMap<>();
    515515        for (Tag tag: tags) {
    516516            Integer v = counters.get(tag.getKey());
    … …  
    557557     */
    558558    public Set<String> getValues() {
    559         HashSet<String> ret = new HashSet<>();
     559        Set<String> ret = new HashSet<>();
    560560        for (Tag tag: tags) {
    561561            ret.add(tag.getValue());
    … …  
    573573     */
    574574    public Set<String> getValues(String key) {
    575         HashSet<String> ret = new HashSet<>();
     575        Set<String> ret = new HashSet<>();
    576576        if (key == null) return ret;
    577577        for (Tag tag: tags) {

  • trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java

    r7509 r8338  
    4646
    4747    public static String combineTags(String name, Set<String> values) {
    48         TreeSet<Object> resultSet = new TreeSet<>();
     48        Set<Object> resultSet = new TreeSet<>();
    4949        for (String value: values) {
    5050            String[] parts = value.split(":");

  • trunk/src/org/openstreetmap/josm/data/osm/Way.java

    r8325 r8338  
    168168     */
    169169    public Set<Node> getNeighbours(Node node) {
    170         HashSet<Node> neigh = new HashSet<>();
     170        Set<Node> neigh = new HashSet<>();
    171171
    172172        if (node == null) return neigh;

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

    r8291 r8338  
    99import java.util.List;
    1010import java.util.Map;
     11import java.util.Set;
    1112import java.util.concurrent.CopyOnWriteArrayList;
    1213
    … …  
    187188
    188189    public Collection<Long> getChangesetIds() {
    189         final HashSet<Long> ids = new HashSet<>();
     190        final Set<Long> ids = new HashSet<>();
    190191        for (Collection<HistoryOsmPrimitive> i : data.values()) {
    191192            for (HistoryOsmPrimitive j : i) {

  • trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

    r7005 r8338  
    386386        if (!isFixable(testError)) return null;
    387387        Collection<OsmPrimitive> sel = new LinkedList<>(testError.getPrimitives());
    388         LinkedHashSet<Node> nodes = new LinkedHashSet<>(OsmPrimitive.getFilteredList(sel, Node.class));
     388        Set<Node> nodes = new LinkedHashSet<>(OsmPrimitive.getFilteredList(sel, Node.class));
    389389
    390390        // Filter nodes that have already been deleted (see #5764 and #5773)

  • trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

    r7937 r8338  
    229229        if (testError.getCode() == SAME_RELATION) return null;
    230230        Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
    231         HashSet<Relation> relFix = new HashSet<>();
     231        Set<Relation> relFix = new HashSet<>();
    232232
    233233        for (OsmPrimitive osm : sel)
    … …  
    292292        // We fix it only if there is no more than one relation that is relation member.
    293293        Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
    294         HashSet<Relation> relations = new HashSet<>();
     294        Set<Relation> relations = new HashSet<>();
    295295
    296296        for (OsmPrimitive osm : sel)

  • trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java

    r7721 r8338  
    237237    public Command fixError(TestError testError) {
    238238        Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
    239         HashSet<Way> ways = new HashSet<>();
     239        Set<Way> ways = new HashSet<>();
    240240
    241241        for (OsmPrimitive osm : sel) {
    … …  
    305305        // We fix it only if there is no more than one way that is relation member.
    306306        Collection<? extends OsmPrimitive> sel = testError.getPrimitives();
    307         HashSet<Way> ways = new HashSet<>();
     307        Set<Way> ways = new HashSet<>();
    308308
    309309        for (OsmPrimitive osm : sel) {

  • trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

    r8285 r8338  
    1212import java.util.Locale;
    1313import java.util.Map;
     14import java.util.Set;
    1415
    1516import org.openstreetmap.josm.command.ChangePropertyCommand;
    … …  
    152153        }
    153154
    154         final HashSet<OsmPrimitive> referrers = new HashSet<>();
     155        final Set<OsmPrimitive> referrers = new HashSet<>();
    155156
    156157        if (way.isClosed()) {

  • trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java

    r8239 r8338  
    66import java.util.HashSet;
    77import java.util.Map.Entry;
     8import java.util.Set;
    89import java.util.regex.Pattern;
    910
    … …  
    6061    @Override
    6162    public void check(OsmPrimitive p) {
    62         HashSet<String> names = new HashSet<>();
     63        Set<String> names = new HashSet<>();
    6364
    6465        for (Entry<String, String> entry : p.getKeys().entrySet()) {

  • trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

    r7941 r8338  
    1010import java.util.HashMap;
    1111import java.util.LinkedList;
     12import java.util.List;
    1213import java.util.Map;
    1314
    … …  
    8485
    8586    private static class RolePreset {
    86         public RolePreset(LinkedList<Role> roles, String name) {
     87        public RolePreset(List<Role> roles, String name) {
    8788            this.roles = roles;
    8889            this.name = name;
    8990        }
    90         private final LinkedList<Role> roles;
     91        private final List<Role> roles;
    9192        private final String name;
    9293    }
    … …  
    151152                for(Role role: r.roles) {
    152153                    String key = role.key;
    153                     LinkedList<Role> roleGroup = null;
     154                    List<Role> roleGroup = null;
    154155                    if (allroles.containsKey(key)) {
    155156                        roleGroup = allroles.get(key).roles;

  • trunk/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java

    r7005 r8338  
    66import java.util.Arrays;
    77import java.util.HashSet;
     8import java.util.Set;
    89
    910import org.openstreetmap.josm.data.osm.Node;
    … …  
    2930    }
    3031
    31     @Override public void visit(Way w) {
    32         HashSet<Node> nodes = new HashSet<>();
     32    @Override
     33    public void visit(Way w) {
     34        Set<Node> nodes = new HashSet<>();
    3335
    3436        for (int i = 1; i < w.getNodesCount() - 1; i++) {

  • trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java

    r7848 r8338  
    4040    private MultiMap<Way, Way> errorWays;
    4141
    42     private ArrayList<NormalizeRule> rules = new ArrayList<NormalizeRule>();
     42    private List<NormalizeRule> rules = new ArrayList<NormalizeRule>();
    4343
    4444    /**
Note: See TracChangeset for help on using the changeset viewer.