Changeset 2569 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
- Timestamp:
- 2009-12-04T15:53:55+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r2512 r2569 15 15 import java.util.HashMap; 16 16 import java.util.Observable; 17 import java.util.logging.Logger;18 17 19 18 import javax.swing.AbstractListModel; … … 120 119 return entries.get(MERGED_ENTRIES); 121 120 } 121 122 122 protected ArrayList<T> getMyEntries() { 123 123 return entries.get(MY_ENTRIES); 124 124 } 125 125 126 protected ArrayList<T> getTheirEntries() { 126 127 return entries.get(THEIR_ENTRIES);
Note:
See TracChangeset
for help on using the changeset viewer.