Changeset 19388 in josm

Timestamp:

2025-04-23T20:03:54+02:00 (11 days ago)

Author:

stoecker

Message:

see #24238 - fix PMD issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxImageCorrelation.java (modified) (4 diffs)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• tools/ExifReader.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
@@ -238 +239 @@
                     return pdopvalue.doubleValue();
                 } else if (wp.attr.get(GpxConstants.PT_PDOP) instanceof Double) {
-                    Double pdopvalue = (Double) wp.attr.get(GpxConstants.PT_PDOP);
-                    return pdopvalue.doubleValue();
+                    return (Double) wp.attr.get(GpxConstants.PT_PDOP);
                 }
             } else if (wp.attr.get(GpxConstants.PT_HDOP) != null) {
@@ -246 +246 @@
                     return hdopvalue.doubleValue();
                 } else if (wp.attr.get(GpxConstants.PT_HDOP) instanceof Double) {
-                    Double hdopvalue = (Double) wp.attr.get(GpxConstants.PT_HDOP);
-                    return hdopvalue.doubleValue();
+                    return (Double) wp.attr.get(GpxConstants.PT_HDOP);
                 }
             }
@@ -279 +278 @@
                 return null;
             }
-            gpsProcMethod = "GNSS" + " " + positioningModes.get(lowestProcIndex).toUpperCase() + " " + "CORRELATION";
+            gpsProcMethod = "GNSS" + " " + positioningModes.get(lowestProcIndex).toUpperCase(Locale.ENGLISH) + " " + "CORRELATION";
             if (lowestProcIndex < lowestGnssModeIdx) {
-                gpsProcMethod = positioningModes.get(lowestProcIndex).toUpperCase() + " " + "CORRELATION";
+                gpsProcMethod = positioningModes.get(lowestProcIndex).toUpperCase(Locale.ENGLISH) + " " + "CORRELATION";
             } else {
-                gpsProcMethod = "GNSS" + " " + positioningModes.get(lowestProcIndex).toUpperCase() + " " + "CORRELATION";
+                gpsProcMethod = "GNSS" + " " + positioningModes.get(lowestProcIndex).toUpperCase(Locale.ENGLISH) + " " + "CORRELATION";
             }
             gpsProcMethod = gpsProcMethod.replace("FLOAT RTK", "RTK_FLOAT");

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

@@ -482 +482 @@
 
     static String loadGpsDatum() {
-        String gpsDatum = Config.getPref().get("geoimage.datum", "WGS-84");
-        return gpsDatum;
+        return Config.getPref().get("geoimage.datum", "WGS-84");
     }
 

trunk/src/org/openstreetmap/josm/tools/ExifReader.java

@@ -150 +150 @@
         if (dirGps != null) {
             try {
-                Instant dateTimeStamp = dirGps.getGpsDate().toInstant();
-                return dateTimeStamp;
+                return dirGps.getGpsDate().toInstant();
             } catch (UncheckedParseException | DateTimeException e) {
                 Logging.error(e);
@@ -422 +421 @@
         if (dirGps != null) {
             Double hposerr = dirGps.getDoubleObject(GpsDirectory.TAG_H_POSITIONING_ERROR);
-            if (hposerr != null) {
-                return hposerr.doubleValue();
-            }
+            if (hposerr != null)
+                return hposerr;
         }
         return null;
@@ -465 +463 @@
         if (dirGps != null) {
             Integer gpsDiffMode = dirGps.getInteger(GpsDirectory.TAG_DIFFERENTIAL);
-            if (gpsDiffMode != null) {
-                return gpsDiffMode.intValue();
-            }
+            if (gpsDiffMode != null)
+                return gpsDiffMode;
         }
         return null;
@@ -508 +505 @@
         if (dirGps != null) {
             Integer gps2d3dMode = dirGps.getInteger(GpsDirectory.TAG_MEASURE_MODE);
-            if (gps2d3dMode != null) {
-                return gps2d3dMode.intValue();
-            }
+            if (gps2d3dMode != null)
+                return gps2d3dMode;
         }
         return null;
@@ -544 +540 @@
             Double gpsDop = dirGps.getDoubleObject(GpsDirectory.TAG_DOP);
             if (gpsDop != null) {
-                return gpsDop.doubleValue();
+                return gpsDop;
             }
         }
@@ -578 +574 @@
         if (dirGps != null) {
             String gpsDatum = dirGps.getString(GpsDirectory.TAG_MAP_DATUM);
-            if (gpsDatum != null) {
-                return gpsDatum.toString();
-            }
+            if (gpsDatum != null)
+                return gpsDatum;
         }
         return null;
@@ -637 +632 @@
         if (dirGps != null) {
             String gpsProcessingMethod = dirGps.getDescription(GpsDirectory.TAG_PROCESSING_METHOD);
-            if (gpsProcessingMethod != null) {
-                return gpsProcessingMethod.toString();
-            }
+            if (gpsProcessingMethod != null)
+                return gpsProcessingMethod;
         }
         return null;