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/gui
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8308 r8338  
    684684    private Map<Double, List<Node>> getNearestNodesImpl(Point p,
    685685            Predicate<OsmPrimitive> predicate) {
    686         TreeMap<Double, List<Node>> nearestMap = new TreeMap<>();
     686        Map<Double, List<Node>> nearestMap = new TreeMap<>();
    687687        DataSet ds = getCurrentDataSet();
    688688

  • trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java

    r8308 r8338  
    229229
    230230        public Set<OsmPrimitive> getObjectsToDelete() {
    231             HashSet<OsmPrimitive> ret = new HashSet<>();
     231            Set<OsmPrimitive> ret = new HashSet<>();
    232232            for (RelationToChildReference ref: data) {
    233233                ret.add(ref.getChild());
    … …  
    241241
    242242        public Set<OsmPrimitive> getParentRelations() {
    243             HashSet<OsmPrimitive> ret = new HashSet<>();
     243            Set<OsmPrimitive> ret = new HashSet<>();
    244244            for (RelationToChildReference ref: data) {
    245245                ret.add(ref.getParent());

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r8308 r8338  
    731731        private final transient List<T> entries;
    732732
    733         public EntriesSelectionModel(ArrayList<T> nodes) {
     733        public EntriesSelectionModel(List<T> nodes) {
    734734            this.entries = nodes;
    735735        }

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

    r8308 r8338  
    253253
    254254    protected List<Command> buildTagChangeCommand(OsmPrimitive primitive, TagCollection tc) {
    255         LinkedList<Command> cmds = new LinkedList<>();
     255        List<Command> cmds = new LinkedList<>();
    256256        for (String key : tc.getKeys()) {
    257257            if (tc.hasUniqueEmptyValue(key)) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r8308 r8338  
    287287
    288288        protected Map<User, Integer> computeStatistics(Collection<? extends OsmPrimitive> primitives) {
    289             HashMap<User, Integer> ret = new HashMap<>();
     289            Map<User, Integer> ret = new HashMap<>();
    290290            if (primitives == null || primitives.isEmpty()) return ret;
    291291            for (OsmPrimitive primitive: primitives) {
    … …  
    354354
    355355        public List<User> getSelectedUsers(int[] rows) {
    356             LinkedList<User> ret = new LinkedList<>();
     356            List<User> ret = new LinkedList<>();
    357357            if (rows == null || rows.length == 0) return ret;
    358358            for (int row: rows) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r8308 r8338  
    190190        Set<DefaultMutableTreeNode> processedNodes = new HashSet<>();
    191191
    192         LinkedList<TestError> errorsToFix = new LinkedList<>();
     192        List<TestError> errorsToFix = new LinkedList<>();
    193193        for (TreePath path : selectionPaths) {
    194194            DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
    … …  
    548548            tree.setFilter(null);
    549549        }
    550         HashSet<OsmPrimitive> filter = new HashSet<>(newSelection);
    551         tree.setFilter(filter);
     550        tree.setFilter(new HashSet<>(newSelection));
    552551    }
    553552

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java

    r8291 r8338  
    6565        }
    6666
    67         HashSet<Integer> ids = new HashSet<>();
     67        Set<Integer> ids = new HashSet<>();
    6868        for (Changeset cs: changesets) {
    6969            if (cs == null || cs.isNew()) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r8308 r8338  
    608608        final Map<String, String> tags = new HashMap<>();
    609609        valueCount.clear();
    610         EnumSet<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
     610        Set<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
    611611        for (OsmPrimitive osm : newSel) {
    612612            types.add(TaggingPresetType.forPrimitive(osm));
    … …  
    619619                        v.put(value, v.containsKey(value) ? v.get(value) + 1 : 1);
    620620                    } else {
    621                         TreeMap<String, Integer> v = new TreeMap<>();
     621                        Map<String, Integer> v = new TreeMap<>();
    622622                        v.put(value, 1);
    623623                        valueCount.put(key, v);
    … …  
    753753        int row = tagTable.getSelectedRow();
    754754        if (row == -1) return null;
    755         TreeMap<String, Integer> map = (TreeMap<String, Integer>) tagData.getValueAt(row, 1);
     755        Map<String, Integer> map = (TreeMap<String, Integer>) tagData.getValueAt(row, 1);
    756756        return new Tag(
    757757                tagData.getValueAt(row, 0).toString(),
    … …  
    905905        protected void deleteTags(int[] rows){
    906906            // convert list of rows to HashMap (and find gap for nextKey)
    907             HashMap<String, String> tags = new HashMap<>(rows.length);
     907            Map<String, String> tags = new HashMap<>(rows.length);
    908908            int nextKeyIndex = rows[0];
    909909            for (int row : rows) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r8308 r8338  
    258258            if (selection == null || selection.length == 0)
    259259                return;
    260             HashSet<Relation> relations = new HashSet<>();
     260            Set<Relation> relations = new HashSet<>();
    261261            for (TreePath aSelection : selection) {
    262262                relations.add((Relation) aSelection.getLastPathComponent());

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r8318 r8338  
    514514     */
    515515    public Set<OsmPrimitive> getChildPrimitives(Collection<? extends OsmPrimitive> referenceSet) {
    516         HashSet<OsmPrimitive> ret = new HashSet<>();
     516        Set<OsmPrimitive> ret = new HashSet<>();
    517517        if (referenceSet == null) return null;
    518518        for (RelationMember m: members) {
    … …  
    606606        if (primitives == null || primitives.isEmpty())
    607607            return false;
    608         HashSet<OsmPrimitive> referrers = new HashSet<>();
     608        Set<OsmPrimitive> referrers = new HashSet<>();
    609609        for (RelationMember member : members) {
    610610            referrers.add(member.getMember());

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

    r8285 r8338  
    233233    private Integer popBackwardOnewayPart(int way){
    234234        if (lastOnewayNode != null) {
    235             TreeSet<Node> nodes = new TreeSet<>();
     235            Set<Node> nodes = new TreeSet<>();
    236236            if (onewayReverseMap.ways.containsKey(way)) {
    237237                nodes.addAll(onewayReverseMap.ways.get(way));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java

    r8259 r8338  
    175175        }
    176176
    177         for (LinkedList<Integer> tmpGroup : allGroups) {
     177        for (List<Integer> tmpGroup : allGroups) {
    178178            for (Integer p : tmpGroup) {
    179179                newMembers.add(defaultMembers.get(p));

  • trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

    r8291 r8338  
    158158        Collection<Collection<String>> args = Main.pref.getArray("bookmarks", null);
    159159        if(args != null) {
    160             LinkedList<Bookmark> bookmarks = new LinkedList<>();
     160            List<Bookmark> bookmarks = new LinkedList<>();
    161161            for(Collection<String> entry : args) {
    162162                try {
    … …  
    178178     */
    179179    public final void save() {
    180         LinkedList<Collection<String>> coll = new LinkedList<>();
     180        List<Collection<String>> coll = new LinkedList<>();
    181181        for (Object o : ((DefaultListModel<Bookmark>)getModel()).toArray()) {
    182182            String[] array = new String[5];

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    r8308 r8338  
    1010import java.util.List;
    1111import java.util.Observable;
     12import java.util.Set;
    1213
    1314import javax.swing.JTable;
    … …  
    535536
    536537        protected void initKeyList() {
    537             HashSet<String> keySet = new HashSet<>();
     538            Set<String> keySet = new HashSet<>();
    538539            if (current != null) {
    539540                keySet.addAll(current.getTags().keySet());

  • trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

    r8221 r8338  
    190190                return null;
    191191        }
    192         ArrayList<PrimitiveId> downloaded = new ArrayList<>(ids);
     192        List<PrimitiveId> downloaded = new ArrayList<>(ids);
    193193        downloaded.removeAll(mainTask.getMissingPrimitives());
    194194        return downloaded;

  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r8332 r8338  
    2727import java.util.List;
    2828import java.util.Map;
     29import java.util.Set;
    2930import java.util.concurrent.Callable;
    3031import java.util.concurrent.CopyOnWriteArrayList;
    … …  
    548549        GpxData gpxData = new GpxData();
    549550        gpxData.storageFile = file;
    550         HashSet<Node> doneNodes = new HashSet<>();
     551        Set<Node> doneNodes = new HashSet<>();
    551552        waysToGpxData(data.getWays(), gpxData, doneNodes);
    552553        nodesToGpxData(data.getNodes(), gpxData, doneNodes);
    … …  
    554555    }
    555556
    556     private static void waysToGpxData(Collection<Way> ways, GpxData gpxData, HashSet<Node> doneNodes) {
     557    private static void waysToGpxData(Collection<Way> ways, GpxData gpxData, Set<Node> doneNodes) {
    557558        for (Way w : ways) {
    558559            if (!w.isUsable()) {
    … …  
    632633    }
    633634
    634     private static void nodesToGpxData(Collection<Node> nodes, GpxData gpxData, HashSet<Node> doneNodes) {
     635    private static void nodesToGpxData(Collection<Node> nodes, GpxData gpxData, Set<Node> doneNodes) {
    635636        List<Node> sortedNodes = new ArrayList<>(nodes);
    636637        sortedNodes.removeAll(doneNodes);
    … …  
    645646
    646647    private static void addIntegerIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String ... osmKeys) {
    647         ArrayList<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
     648        List<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
    648649        possibleKeys.add(0, gpxKey);
    649650        for (String key : possibleKeys) {
    … …  
    668669
    669670    private static void addDoubleIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String ... osmKeys) {
    670         ArrayList<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
     671        List<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
    671672        possibleKeys.add(0, gpxKey);
    672673        for (String key : possibleKeys) {
    … …  
    690691
    691692    private static void addStringIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String ... osmKeys) {
    692         ArrayList<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
     693        List<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
    693694        possibleKeys.add(0, gpxKey);
    694695        for (String key : possibleKeys) {

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java

    r8308 r8338  
    5959            File[] sel = fc.getSelectedFiles();
    6060            if (sel != null && sel.length > 0) {
    61                 LinkedList<File> files = new LinkedList<>();
     61                List<File> files = new LinkedList<>();
    6262                addRecursiveFiles(files, sel);
    6363                importer.importDataHandleExceptions(files, NullProgressMonitor.INSTANCE);

  • trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

    r8332 r8338  
    196196    public Cascade clone() {
    197197        @SuppressWarnings("unchecked")
    198         HashMap<String, Object> clonedProp = (HashMap<String, Object>) ((HashMap) this.prop).clone();
     198        Map<String, Object> clonedProp = (Map<String, Object>) ((HashMap) this.prop).clone();
    199199        Cascade c = new Cascade();
    200200        c.prop = clonedProp;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java

    r7005 r8338  
    188188                nameTags = Collections.emptyList();
    189189            }
    190             ArrayList<String> result = new ArrayList<>();
     190            List<String> result = new ArrayList<>();
    191191            for(String tag: nameTags) {
    192192                if (tag == null) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

    r8297 r8338  
    146146    }
    147147
    148     public static final EnumSet<Op> COMPARISON_OPERATERS =
    149         EnumSet.of(Op.GREATER_OR_EQUAL, Op.GREATER, Op.LESS_OR_EQUAL, Op.LESS);
    150 
    151148    /**
    152149     * Most common case of a KeyValueCondition.
    … …  
    223220
    224221        public final Pattern pattern;
    225         public static final EnumSet<Op> SUPPORTED_OPS = EnumSet.of(Op.REGEX, Op.NREGEX);
     222        public static final Set<Op> SUPPORTED_OPS = EnumSet.of(Op.REGEX, Op.NREGEX);
    226223
    227224        public KeyValueRegexpCondition(String k, String v, Op op, boolean considerValAsKey) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r8318 r8338  
    185185             * primitive. This includes all key=* rules.
    186186             */
    187             HashMap<String, BitSet> specialRules = new HashMap<>();
     187            Map<String, BitSet> specialRules = new HashMap<>();
    188188
    189189            public void addForKey(int ruleIndex) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

    r7596 r8338  
    186186    private void get(OsmPrimitive primitive, boolean closed, WayPrototypesRecord p, Double scale, MultiCascade mc) {
    187187        String lineIdx = null;
    188         HashMap<String, LinemodPrototype> overlayMap = new HashMap<>();
     188        Map<String, LinemodPrototype> overlayMap = new HashMap<>();
    189189        boolean isNotArea = primitive.isKeyFalse("area");
    190190        for (String key : primitive.keySet()) {

  • trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

    r8308 r8338  
    10711071     */
    10721072    public void addCustomButton(String definitionText, int preferredIndex, boolean removeIfExists) {
    1073         LinkedList<String> t = new LinkedList<>(getToolString());
     1073        List<String> t = new LinkedList<>(getToolString());
    10741074        if (t.contains(definitionText)) {
    10751075            if (!removeIfExists) return; // do nothing

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

    r8018 r8338  
    286286        pnlPluginUpdatePolicy.rememberInPreferences();
    287287        if (model.isActivePluginsChanged()) {
    288             LinkedList<String> l = new LinkedList<>(model.getSelectedPluginNames());
     288            List<String> l = new LinkedList<>(model.getSelectedPluginNames());
    289289            Collections.sort(l);
    290290            Main.pref.putCollection("plugins", l);

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

    r8308 r8338  
    310310        if (tags == null)
    311311            return;
    312         ArrayList<TagModel> toDelete = new ArrayList<>();
     312        List<TagModel> toDelete = new ArrayList<>();
    313313        for (int tagIdx : tagIndices) {
    314314            TagModel tag = tags.get(tagIdx);
    … …  
    488488
    489489        List<String> currentkeys = getKeys();
    490         ArrayList<Command> commands = new ArrayList<>();
     490        List<Command> commands = new ArrayList<>();
    491491
    492492        for (OsmPrimitive primitive : primitives) {
    … …  
    512512     */
    513513    public List<String> getKeys() {
    514         ArrayList<String> keys = new ArrayList<>();
     514        List<String> keys = new ArrayList<>();
    515515        for (TagModel tag: tags) {
    516516            if (!tag.getName().trim().isEmpty()) {

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r8318 r8338  
    2020import java.util.List;
    2121import java.util.Map;
     22import java.util.Set;
    2223
    2324import javax.swing.AbstractAction;
    … …  
    8586     * The types as preparsed collection.
    8687     */
    87     public EnumSet<TaggingPresetType> types;
     88    public Set<TaggingPresetType> types;
    8889    public transient List<TaggingPresetItem> data = new LinkedList<>();
    8990    public transient Roles roles;
    … …  
    502503            super("", ImageProvider.get("dialogs", "pin"));
    503504            putValue(SHORT_DESCRIPTION, tr("Add or remove toolbar button"));
    504             LinkedList<String> t = new LinkedList<>(ToolbarPreferences.getToolString());
     505            List<String> t = new LinkedList<>(ToolbarPreferences.getToolString());
    505506            toolbarIndex = t.indexOf(getToolbarString());
    506507            putValue(SELECTED_KEY, toolbarIndex >= 0);

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

    r8332 r8338  
    3030import java.util.Map;
    3131import java.util.Map.Entry;
     32import java.util.Set;
     33import java.util.SortedSet;
    3234import java.util.TreeSet;
    3335
    … …  
    8183
    8284    // cache the parsing of types using a LRU cache (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
    83     private static final Map<String,EnumSet<TaggingPresetType>> TYPE_CACHE = new LinkedHashMap<>(16, 1.1f, true);
     85    private static final Map<String,Set<TaggingPresetType>> TYPE_CACHE = new LinkedHashMap<>(16, 1.1f, true);
    8486
    8587    /**
    … …  
    167169
    168170    public static class Role {
    169         public EnumSet<TaggingPresetType> types;
     171        public Set<TaggingPresetType> types;
    170172        public String key;
    171173        /** The text to display */
    … …  
    290292
    291293    public static class Usage {
    292         private TreeSet<String> values;
     294        private SortedSet<String> values;
    293295        private boolean hadKeys = false;
    294296        private boolean hadEmpty = false;
    … …  
    13961398            } else {
    13971399                String s = o.toString();
    1398                 TreeSet<String> parts = new TreeSet<>(Arrays.asList(s.split(delimiter)));
     1400                Set<String> parts = new TreeSet<>(Arrays.asList(s.split(delimiter)));
    13991401                ListModel<PresetListEntry> lm = getModel();
    14001402                int[] intParts = new int[lm.getSize()];
    … …  
    14291431    }
    14301432
    1431     public static EnumSet<TaggingPresetType> getType(String types) throws SAXException {
     1433    public static Set<TaggingPresetType> getType(String types) throws SAXException {
    14321434        if (TYPE_CACHE.containsKey(types))
    14331435            return TYPE_CACHE.get(types);
    1434         EnumSet<TaggingPresetType> result = EnumSet.noneOf(TaggingPresetType.class);
     1436        Set<TaggingPresetType> result = EnumSet.noneOf(TaggingPresetType.class);
    14351437        for (String type : Arrays.asList(types.split(","))) {
    14361438            try {

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

    r8126 r8338  
    287287     */
    288288    public static Collection<TaggingPreset> readAll(Collection<String> sources, boolean validate, boolean displayErrMsg) {
    289         LinkedList<TaggingPreset> allPresets = new LinkedList<>();
     289        List<TaggingPreset> allPresets = new LinkedList<>();
    290290        for(String source : sources)  {
    291291            try {

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchPrimitiveDialog.java

    r8126 r8338  
    77import java.awt.event.KeyEvent;
    88import java.util.HashSet;
     9import java.util.Set;
    910
    1011import org.openstreetmap.josm.Main;
    … …  
    6263            TaggingPreset preset = selector.getSelectedPreset();
    6364            if (preset != null) {
    64                 final HashSet<OsmPrimitive> matching = new HashSet<>(Utils.filter(Main.main.getCurrentDataSet().allPrimitives(), preset));
     65                final Set<OsmPrimitive> matching = new HashSet<>(Utils.filter(Main.main.getCurrentDataSet().allPrimitives(), preset));
    6566                Main.main.getCurrentDataSet().setSelected(matching);
    6667            }

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java

    r8308 r8338  
    2323import java.util.List;
    2424import java.util.Objects;
     25import java.util.Set;
    2526
    2627import javax.swing.AbstractAction;
    … …  
    7475    private final JCheckBox ckOnlyApplicable;
    7576    private final JCheckBox ckSearchInTags;
    76     private final EnumSet<TaggingPresetType> typesInSelection = EnumSet.noneOf(TaggingPresetType.class);
     77    private final Set<TaggingPresetType> typesInSelection = EnumSet.noneOf(TaggingPresetType.class);
    7778    private boolean typesInSelectionDirty = true;
    7879    private final transient PresetClassifications classifications = new PresetClassifications();
    … …  
    356357        private final List<PresetClassification> classifications = new ArrayList<>();
    357358
    358         public List<PresetClassification> getMatchingPresets(String searchText, boolean onlyApplicable, boolean inTags, EnumSet<TaggingPresetType> presetTypes, final Collection<? extends OsmPrimitive> selectedPrimitives) {
     359        public List<PresetClassification> getMatchingPresets(String searchText, boolean onlyApplicable, boolean inTags,
     360                Set<TaggingPresetType> presetTypes, final Collection<? extends OsmPrimitive> selectedPrimitives) {
    359361            final String[] groupWords;
    360362            final String[] nameWords;
    … …  
    371373        }
    372374
    373         public List<PresetClassification> getMatchingPresets(String[] groupWords, String[] nameWords, boolean onlyApplicable, boolean inTags, EnumSet<TaggingPresetType> presetTypes, final Collection<? extends OsmPrimitive> selectedPrimitives) {
     375        public List<PresetClassification> getMatchingPresets(String[] groupWords, String[] nameWords, boolean onlyApplicable,
     376                boolean inTags, Set<TaggingPresetType> presetTypes, final Collection<? extends OsmPrimitive> selectedPrimitives) {
    374377
    375378            final List<PresetClassification> result = new ArrayList<>();
    … …  
    451454    }
    452455
    453     private EnumSet<TaggingPresetType> getTypesInSelection() {
     456    private Set<TaggingPresetType> getTypesInSelection() {
    454457        if (typesInSelectionDirty) {
    455458            synchronized (typesInSelection) {

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresets.java

    r7937 r8338  
    55import java.util.Collection;
    66import java.util.HashMap;
     7import java.util.Map;
    78
    89import javax.swing.JMenu;
    … …  
    5152        } else {
    5253            AutoCompletionManager.cachePresets(taggingPresets);
    53             HashMap<TaggingPresetMenu,JMenu> submenus = new HashMap<>();
     54            Map<TaggingPresetMenu,JMenu> submenus = new HashMap<>();
    5455            for (final TaggingPreset p : taggingPresets) {
    5556                JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;

  • trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

    r8072 r8338  
    1313import java.awt.event.KeyEvent;
    1414import java.util.ArrayList;
     15import java.util.List;
    1516import java.util.Set;
    1617import java.util.TreeSet;
    … …  
    3536    private Timer timer;
    3637
    37     private final ArrayList<KeyPressReleaseListener> keyListeners = new ArrayList<>();
    38     private final ArrayList<ModifierListener> modifierListeners = new ArrayList<>();
     38    private final List<KeyPressReleaseListener> keyListeners = new ArrayList<>();
     39    private final List<ModifierListener> modifierListeners = new ArrayList<>();
    3940    private int previousModifiers;
    4041
Note: See TracChangeset for help on using the changeset viewer.