Changeset 19101 in josm for trunk/src/org/openstreetmap/josm/tools/ExifReader.java

Timestamp:

2024-06-11T23:53:20+02:00 (5 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x

I haven't updated to PMD 7.x in ivy/maven yet since I still have 83 PMD violations
to go through, and I don't know (yet) if any of them were supposed to be ignored
by the xpath expressions in tools/pmd/josm-ruleset.xml.

I may re-enable some of the PMD checks I've temporarily disabled prior to committing
the update for PMD.

Additionally cleanup some SonarLint issues in the modified files.

File:

• trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified) (8 diffs)

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

@@ -23 +23 @@
 import com.drew.metadata.exif.ExifDirectoryBase;
 import com.drew.metadata.exif.ExifIFD0Directory;
-import com.drew.metadata.exif.ExifSubIFDDirectory;
 import com.drew.metadata.exif.GpsDirectory;
 import com.drew.metadata.iptc.IptcDirectory;
@@ -76 +75 @@
                 }
                 for (Tag tag : dirIt.getTags()) {
-                    if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL /* 0x9003 */ &&
-                            !tag.getDescription().matches("\\[[0-9]+ .+\\]")) {
+                    if (tag.getTagType() == ExifDirectoryBase.TAG_DATETIME_ORIGINAL /* 0x9003 */ &&
+                            !tag.getDescription().matches("\\[\\d+ .+]")) {
                         dateTimeOrig = tag.getDescription();
-                    } else if (tag.getTagType() == ExifIFD0Directory.TAG_DATETIME /* 0x0132 */) {
+                    } else if (tag.getTagType() == ExifDirectoryBase.TAG_DATETIME /* 0x0132 */) {
                         dateTime = tag.getDescription();
-                    } else if (tag.getTagType() == ExifSubIFDDirectory.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
+                    } else if (tag.getTagType() == ExifDirectoryBase.TAG_DATETIME_DIGITIZED /* 0x9004 */) {
                         dateTimeDig = tag.getDescription();
-                    } else if (tag.getTagType() == ExifSubIFDDirectory.TAG_SUBSECOND_TIME_ORIGINAL /* 0x9291 */) {
+                    } else if (tag.getTagType() == ExifDirectoryBase.TAG_SUBSECOND_TIME_ORIGINAL /* 0x9291 */) {
                         subSecOrig = tag.getDescription();
-                    } else if (tag.getTagType() == ExifSubIFDDirectory.TAG_SUBSECOND_TIME /* 0x9290 */) {
+                    } else if (tag.getTagType() == ExifDirectoryBase.TAG_SUBSECOND_TIME /* 0x9290 */) {
                         subSec = tag.getDescription();
-                    } else if (tag.getTagType() == ExifSubIFDDirectory.TAG_SUBSECOND_TIME_DIGITIZED /* 0x9292 */) {
+                    } else if (tag.getTagType() == ExifDirectoryBase.TAG_SUBSECOND_TIME_DIGITIZED /* 0x9292 */) {
                         subSecDig = tag.getDescription();
                     }
@@ -145 +144 @@
             final Metadata metadata = JpegMetadataReader.readMetadata(filename);
             final Directory dir = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
-            return dir == null ? null : dir.getInteger(ExifIFD0Directory.TAG_ORIENTATION);
+            return dir == null ? null : dir.getInteger(ExifDirectoryBase.TAG_ORIENTATION);
         } catch (JpegProcessingException | IOException e) {
             Logging.error(e);
@@ -316 +315 @@
             if (ele != null) {
                 final Integer d = dirGps.getInteger(GpsDirectory.TAG_ALTITUDE_REF);
-                if (d != null && d.intValue() == 1) {
+                if (d != null && d == 1) {
                     ele *= -1;
                 }
@@ -367 +366 @@
     /**
      * Returns a Transform that fixes the image orientation.
-     *
+     * <p>
      * Only orientation 1, 3, 6 and 8 are supported. Everything else is treated as 1.
      * @param orientation the exif-orientation of the image
@@ -376 +375 @@
     public static AffineTransform getRestoreOrientationTransform(final int orientation, final int width, final int height) {
         final int q;
-        final double ax, ay;
+        final double ax;
+        final double ay;
         switch (orientation) {
         case 8:
@@ -404 +404 @@
      * Check, if the given orientation switches width and height of the image.
      * E.g. 90 degree rotation
-     *
+     * <p>
      * Only orientation 1, 3, 6 and 8 are supported. Everything else is treated
      * as 1.
@@ -416 +416 @@
     /**
      * Check, if the given orientation requires any correction to the image.
-     *
+     * <p>
      * Only orientation 1, 3, 6 and 8 are supported. Everything else is treated
      * as 1.