Changeset 6316 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
- Timestamp:
- 2013-10-07T20:18:17+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r6248 r6316 74 74 private static final int MAX_DELETED_PRIMITIVE_IN_DIALOG = 5; 75 75 76 protected HashMap<ListRole, ArrayList<T>> entries;76 protected Map<ListRole, ArrayList<T>> entries; 77 77 78 78 protected EntriesTableModel myEntriesTableModel; … … 693 693 } 694 694 695 protected ArrayList<T> getEntries() {695 protected List<T> getEntries() { 696 696 return entries.get(role); 697 697 } … … 702 702 * @return the opposite list of entries 703 703 */ 704 protected ArrayList<T> getOppositeEntries() {704 protected List<T> getOppositeEntries() { 705 705 ListRole opposite = getComparePairListModel().getSelectedComparePair().getOppositeRole(role); 706 706 return entries.get(opposite); … … 738 738 */ 739 739 protected class EntriesSelectionModel extends DefaultListSelectionModel { 740 private final ArrayList<T> entries;740 private final List<T> entries; 741 741 742 742 public EntriesSelectionModel(ArrayList<T> nodes) {
Note:
See TracChangeset
for help on using the changeset viewer.