Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java	(revision 19387)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java	(revision 19388)
@@ -6,4 +6,5 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
@@ -238,6 +239,5 @@
                     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,6 +246,5 @@
                     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,9 +278,9 @@
                 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");
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 19387)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 19388)
@@ -482,6 +482,5 @@
 
     static String loadGpsDatum() {
-        String gpsDatum = Config.getPref().get("geoimage.datum", "WGS-84");
-        return gpsDatum;
+        return Config.getPref().get("geoimage.datum", "WGS-84");
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/ExifReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 19387)
+++ trunk/src/org/openstreetmap/josm/tools/ExifReader.java	(revision 19388)
@@ -150,6 +150,5 @@
         if (dirGps != null) {
             try {
-                Instant dateTimeStamp = dirGps.getGpsDate().toInstant();
-                return dateTimeStamp;
+                return dirGps.getGpsDate().toInstant();
             } catch (UncheckedParseException | DateTimeException e) {
                 Logging.error(e);
@@ -422,7 +421,6 @@
         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,7 +463,6 @@
         if (dirGps != null) {
             Integer gpsDiffMode = dirGps.getInteger(GpsDirectory.TAG_DIFFERENTIAL);
-            if (gpsDiffMode != null) {
-                return gpsDiffMode.intValue();
-            }
+            if (gpsDiffMode != null)
+                return gpsDiffMode;
         }
         return null;
@@ -508,7 +505,6 @@
         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,5 +540,5 @@
             Double gpsDop = dirGps.getDoubleObject(GpsDirectory.TAG_DOP);
             if (gpsDop != null) {
-                return gpsDop.doubleValue();
+                return gpsDop;
             }
         }
@@ -578,7 +574,6 @@
         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,7 +632,6 @@
         if (dirGps != null) {
             String gpsProcessingMethod = dirGps.getDescription(GpsDirectory.TAG_PROCESSING_METHOD);
-            if (gpsProcessingMethod != null) {
-                return gpsProcessingMethod.toString();
-            }
+            if (gpsProcessingMethod != null)
+                return gpsProcessingMethod;
         }
         return null;