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

Timestamp:

2015-05-03T18:34:33+02:00 (9 years ago)

Author:

Don-vip

Message:

fix various Sonar issues:

• squid:S1068: Unused private fields should be removed
• squid:S1155: Collection.isEmpty() should be used to test for emptiness
• squid:S1185: Overriding methods should do more than simply call the same method in the super class
• squid:S1694: An abstract class should have both abstract and concrete methods
• squid:S1905: Redundant casts should not be used
• squid:S2065: Fields in non-serializable classes should not be "transient"
• squid:S2583: Conditions should not unconditionally evaluate to "TRUE" or to "FALSE"
• squid:ModifiersOrderCheck: Modifiers should be declared in the correct order

Location:

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

Files:

• CorrelateGpxWithImages.java (modified) (3 diffs)
• GeoImageLayer.java (modified) (6 diffs)

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

@@ -999 +999 @@
 
             // no images found, exit
-            if(imgs.size() <= 0) {
+            if(imgs.isEmpty()) {
                 JOptionPane.showMessageDialog(Main.parent,
                         tr("The selected photos do not contain time information."),
@@ -1207 +1207 @@
         // before the first point will be geotagged with the starting point
         if (prevWpTime == 0 || curWpTime <= prevWpTime) {
-            while (true) {
-                if (i < 0) {
-                    break;
-                }
+            while (i >= 0) {
                 final ImageEntry curImg = images.get(i);
                 long time = curImg.getExifTime().getTime();
@@ -1231 +1228 @@
         // This code gives a simple linear interpolation of the coordinates between current and
         // previous track point assuming a constant speed in between
-        while (true) {
-            if (i < 0) {
-                break;
-            }
+        while (i >= 0) {
             ImageEntry curImg = images.get(i);
             long imgTime = curImg.getExifTime().getTime();

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

@@ -713 +713 @@
 
     public void showNextPhoto() {
-        if (data != null && data.size() > 0) {
+        if (data != null && !data.isEmpty()) {
             currentPhoto++;
             if (currentPhoto >= data.size()) {
@@ -739 +739 @@
 
     public void showFirstPhoto() {
-        if (data != null && data.size() > 0) {
+        if (data != null && !data.isEmpty()) {
             currentPhoto = 0;
             ImageViewerDialog.showImage(this, data.get(currentPhoto));
@@ -749 +749 @@
 
     public void showLastPhoto() {
-        if (data != null && data.size() > 0) {
+        if (data != null && !data.isEmpty()) {
             currentPhoto = data.size() - 1;
             ImageViewerDialog.showImage(this, data.get(currentPhoto));
@@ -764 +764 @@
 
     public void removeCurrentPhoto() {
-        if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) {
+        if (data != null && !data.isEmpty() && currentPhoto >= 0 && currentPhoto < data.size()) {
             data.remove(currentPhoto);
             if (currentPhoto >= data.size()) {
@@ -781 +781 @@
     public void removeCurrentPhotoFromDisk() {
         ImageEntry toDelete = null;
-        if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) {
+        if (data != null && !data.isEmpty() && currentPhoto >= 0 && currentPhoto < data.size()) {
             toDelete = data.get(currentPhoto);
 
@@ -828 +828 @@
     public void copyCurrentPhotoPath() {
         ImageEntry toCopy = null;
-        if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) {
+        if (data != null && !data.isEmpty() && currentPhoto >= 0 && currentPhoto < data.size()) {
             toCopy = data.get(currentPhoto);
             String copyString = toCopy.getFile().toString();