Changeset 6316 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Timestamp:

2013-10-07T20:18:17+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Loose coupling

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• CorrelateGpxWithImages.java (modified) (7 diffs)
• GeoImageLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -810 +810 @@
 
             // Construct a list of images that have a date, and sort them on the date.
-            ArrayList<ImageEntry> dateImgLst = getSortedImgList();
+            List<ImageEntry> dateImgLst = getSortedImgList();
             // Create a temporary copy for each image
             for (ImageEntry ie : dateImgLst) {
@@ -988 +988 @@
             GpxData gpx = gpxW.data;
 
-            ArrayList<ImageEntry> imgs = getSortedImgList();
+            List<ImageEntry> imgs = getSortedImgList();
             PrimaryDateParser dateParser = new PrimaryDateParser();
 
@@ -1060 +1060 @@
     }
 
-    private ArrayList<ImageEntry>  getSortedImgList() {
+    private List<ImageEntry> getSortedImgList() {
         return getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected());
     }
@@ -1071 +1071 @@
      * @return matching images
      */
-    private ArrayList<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {
-        ArrayList<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size());
+    private List<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {
+        List<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size());
         for (ImageEntry e : yLayer.data) {
             if (e.getExifTime() == null) {
@@ -1120 +1120 @@
      * All images need a exifTime attribute and the List must be sorted according to these times.
      */
-    private int matchGpxTrack(ArrayList<ImageEntry> images, GpxData selectedGpx, long offset) {
+    private int matchGpxTrack(List<ImageEntry> images, GpxData selectedGpx, long offset) {
         int ret = 0;
 
@@ -1159 +1159 @@
     }
 
-    private int matchPoints(ArrayList<ImageEntry> images, WayPoint prevWp, long prevWpTime,
+    private int matchPoints(List<ImageEntry> images, WayPoint prevWp, long prevWpTime,
             WayPoint curWp, long curWpTime, long offset) {
         // Time between the track point and the previous one, 5 sec if first point, i.e. photos take
@@ -1246 +1246 @@
     }
 
-    private int getLastIndexOfListBefore(ArrayList<ImageEntry> images, long searchedTime) {
+    private int getLastIndexOfListBefore(List<ImageEntry> images, long searchedTime) {
         int lstSize= images.size();
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -29 +29 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.Action;
@@ -97 +98 @@
         private GeoImageLayer layer;
         private Collection<File> selection;
-        private HashSet<String> loadedDirectories = new HashSet<String>();
-        private LinkedHashSet<String> errorMessages;
+        private Set<String> loadedDirectories = new HashSet<String>();
+        private Set<String> errorMessages;
         private GpxLayer gpxLayer;