Changeset 6316 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
- Timestamp:
- 2013-10-07T20:18:17+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r6310 r6316 810 810 811 811 // Construct a list of images that have a date, and sort them on the date. 812 ArrayList<ImageEntry> dateImgLst = getSortedImgList();812 List<ImageEntry> dateImgLst = getSortedImgList(); 813 813 // Create a temporary copy for each image 814 814 for (ImageEntry ie : dateImgLst) { … … 988 988 GpxData gpx = gpxW.data; 989 989 990 ArrayList<ImageEntry> imgs = getSortedImgList();990 List<ImageEntry> imgs = getSortedImgList(); 991 991 PrimaryDateParser dateParser = new PrimaryDateParser(); 992 992 … … 1060 1060 } 1061 1061 1062 private ArrayList<ImageEntry>getSortedImgList() {1062 private List<ImageEntry> getSortedImgList() { 1063 1063 return getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected()); 1064 1064 } … … 1071 1071 * @return matching images 1072 1072 */ 1073 private ArrayList<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {1074 ArrayList<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size());1073 private List<ImageEntry> getSortedImgList(boolean exif, boolean tagged) { 1074 List<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size()); 1075 1075 for (ImageEntry e : yLayer.data) { 1076 1076 if (e.getExifTime() == null) { … … 1120 1120 * All images need a exifTime attribute and the List must be sorted according to these times. 1121 1121 */ 1122 private int matchGpxTrack( ArrayList<ImageEntry> images, GpxData selectedGpx, long offset) {1122 private int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) { 1123 1123 int ret = 0; 1124 1124 … … 1159 1159 } 1160 1160 1161 private int matchPoints( ArrayList<ImageEntry> images, WayPoint prevWp, long prevWpTime,1161 private int matchPoints(List<ImageEntry> images, WayPoint prevWp, long prevWpTime, 1162 1162 WayPoint curWp, long curWpTime, long offset) { 1163 1163 // Time between the track point and the previous one, 5 sec if first point, i.e. photos take … … 1246 1246 } 1247 1247 1248 private int getLastIndexOfListBefore( ArrayList<ImageEntry> images, long searchedTime) {1248 private int getLastIndexOfListBefore(List<ImageEntry> images, long searchedTime) { 1249 1249 int lstSize= images.size(); 1250 1250
Note:
See TracChangeset
for help on using the changeset viewer.