Changeset 8658 in josm
- Timestamp:
- 2015-08-11T23:34:03+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer/geoimage
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r8653 r8658 1096 1096 */ 1097 1097 private List<ImageEntry> getSortedImgList(boolean exif, boolean tagged) { 1098 if (yLayer.data == null) { 1099 return Collections.emptyList(); 1100 } 1098 1101 List<ImageEntry> dateImgLst = new ArrayList<>(yLayer.data.size()); 1099 1102 for (ImageEntry e : yLayer.data) { -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
r8540 r8658 252 252 Main.main.addLayer(layer); 253 253 254 if (!canceled && !layer.data.isEmpty()) {254 if (!canceled && layer.data != null && !layer.data.isEmpty()) { 255 255 boolean noGeotagFound = true; 256 256 for (ImageEntry e : layer.data) { … … 317 317 public GeoImageLayer(final List<ImageEntry> data, GpxLayer gpxLayer, final String name, boolean useThumbs) { 318 318 super(name != null ? name : tr("Geotagged Images")); 319 Collections.sort(data); 319 if (data != null) { 320 Collections.sort(data); 321 } 320 322 this.data = data; 321 323 this.gpxLayer = gpxLayer; … … 755 757 756 758 public void checkPreviousNextButtons() { 757 ImageViewerDialog.setNextEnabled( currentPhoto < data.size() - 1);759 ImageViewerDialog.setNextEnabled(data != null && currentPhoto < data.size() - 1); 758 760 ImageViewerDialog.setPreviousEnabled(currentPhoto > 0); 759 761 } … … 1087 1089 */ 1088 1090 public List<ImageEntry> getImages() { 1091 if (data == null) { 1092 return Collections.emptyList(); 1093 } 1089 1094 List<ImageEntry> copy = new ArrayList<>(data.size()); 1090 1095 for (ImageEntry ie : data) { -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ShowThumbnailAction.java
r8378 r8658 51 51 */ 52 52 private static boolean enabled(GeoImageLayer layer) { 53 return !layer.data.isEmpty();53 return layer.data != null && !layer.data.isEmpty(); 54 54 } 55 55
Note: See TracChangeset
for help on using the changeset viewer.