This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 36e56b24 Flip null test
36e56b24 is described below
commit 36e56b24626c36762281a7d83a7529b2491d0937
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jul 5 09:34:45 2026 -0400
Flip null test
---
.../org/apache/commons/imaging/AbstractImageParser.java | 2 +-
.../commons/imaging/common/GenericImageMetadata.java | 4 ++--
.../apache/commons/imaging/formats/gif/GifImageParser.java | 2 +-
.../commons/imaging/formats/jpeg/JpegImageMetadata.java | 10 +++++-----
.../apache/commons/imaging/formats/tiff/TiffContents.java | 6 +++---
.../apache/commons/imaging/formats/tiff/TiffDirectory.java | 7 +++----
.../commons/imaging/formats/tiff/TiffImageMetadata.java | 4 ++--
.../commons/imaging/formats/tiff/TiffImageParser.java | 4 ++--
.../apache/commons/imaging/formats/tiff/TiffReader.java | 2 +-
.../formats/tiff/write/AbstractTiffImageWriter.java | 4 ++--
.../formats/tiff/write/TiffImageWriterLossless.java | 2 +-
.../imaging/formats/tiff/write/TiffOutputDirectory.java | 10 +++++-----
.../commons/imaging/formats/tiff/write/TiffOutputSet.java | 10 +++++-----
.../org/apache/commons/imaging/mylzw/MyLzwCompressor.java | 8 ++++----
.../apache/commons/imaging/mylzw/MyLzwDecompressor.java | 4 ++--
.../apache/commons/imaging/examples/MetadataExample.java | 4 ++--
.../commons/imaging/examples/WriteExifMetadataExample.java | 14 +++++++-------
.../commons/imaging/examples/tiff/SurveyTiffFile.java | 4 ++--
18 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/AbstractImageParser.java
b/src/main/java/org/apache/commons/imaging/AbstractImageParser.java
index 878ab103..f53365f9 100644
--- a/src/main/java/org/apache/commons/imaging/AbstractImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/AbstractImageParser.java
@@ -339,7 +339,7 @@ public abstract class AbstractImageParser<T extends
ImagingParameters<T>> extend
final BufferedImageFactory result = params.getBufferedImageFactory();
- if (null != result) {
+ if (result != null) {
return result;
}
diff --git
a/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
b/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
index 215cceed..ab6292ee 100644
--- a/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/common/GenericImageMetadata.java
@@ -69,7 +69,7 @@ public class GenericImageMetadata implements ImageMetadata {
@Override
public String toString(final String prefix) {
final String result = keyword + ": " + text;
- if (null != prefix) {
+ if (prefix != null) {
return prefix + result;
}
return result;
@@ -127,7 +127,7 @@ public class GenericImageMetadata implements ImageMetadata {
if (i > 0) {
result.append(NEWLINE);
}
- // if (null != prefix)
+ // if (prefix != null)
// result.append(prefix);
final ImageMetadataItem item = items.get(i);
diff --git
a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
index cb8c57a6..d75d5078 100644
--- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
@@ -934,7 +934,7 @@ public class GifImageParser extends
AbstractImageParser<GifImagingParameters> im
bos.write((byte) 0); // terminator
}
- if (null != xmpXml) {
+ if (xmpXml != null) {
bos.write(EXTENSION_CODE);
bos.write(APPLICATION_EXTENSION_LABEL);
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
index 454b5fd4..6b015e54 100644
---
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
+++
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
@@ -117,7 +117,7 @@ public class JpegImageMetadata implements ImageMetadata {
final TiffImageMetadata.Directory dir =
(TiffImageMetadata.Directory) d;
// Debug.debug("dir", dir);
BufferedImage image = dir.getThumbnail();
- if (null != image) {
+ if (image != null) {
return image;
}
@@ -193,11 +193,11 @@ public class JpegImageMetadata implements ImageMetadata {
public List<ImageMetadataItem> getItems() {
final List<ImageMetadataItem> result = new ArrayList<>();
- if (null != exif) {
+ if (exif != null) {
result.addAll(exif.getItems());
}
- if (null != photoshop) {
+ if (photoshop != null) {
result.addAll(photoshop.getItems());
}
@@ -227,7 +227,7 @@ public class JpegImageMetadata implements ImageMetadata {
final TiffImageMetadata.Directory dir =
(TiffImageMetadata.Directory) d;
// Debug.debug("dir", dir);
final AbstractTiffImageData rawImageData = dir.getTiffImageData();
- if (null != rawImageData) {
+ if (rawImageData != null) {
return rawImageData;
}
}
@@ -257,7 +257,7 @@ public class JpegImageMetadata implements ImageMetadata {
result.append(exif.toString("\t"));
}
- // if (null != exif && null != photoshop)
+ // if (exif != null && photoshop != null)
result.append(NEWLINE);
result.append(prefix);
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
index 8588a0ac..72949187 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.java
@@ -79,7 +79,7 @@ public class TiffContents {
Debug.debug("element, start: " + element.offset + ", length: " +
element.length + ", end: " + (element.offset + element.length) + ": "
+ element.getElementDescription());
final String verbosity = element.getElementDescription();
- if (null != verbosity) {
+ if (verbosity != null) {
Debug.debug(verbosity);
}
@@ -99,7 +99,7 @@ public class TiffContents {
public TiffField findField(final TagInfo tag) throws ImagingException {
for (final TiffDirectory directory : directories) {
final TiffField field = directory.findField(tag);
- if (null != field) {
+ if (field != null) {
return field;
}
}
@@ -123,7 +123,7 @@ public class TiffContents {
for (final TiffField field : directory) {
final AbstractTiffElement oversizeValue =
field.getOversizeValueElement();
- if (null != oversizeValue) {
+ if (oversizeValue != null) {
result.add(oversizeValue);
}
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
index d09c15ad..eddb4658 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
@@ -1071,7 +1071,7 @@ public class TiffDirectory extends AbstractTiffElement
implements Iterable<TiffF
* @throws ImagingException if an error occurs.
*/
public boolean hasJpegImageData() throws ImagingException {
- return null !=
findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT);
+ return findField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT) !=
null;
}
/**
@@ -1096,11 +1096,10 @@ public class TiffDirectory extends AbstractTiffElement
implements Iterable<TiffF
* @throws ImagingException if an error occurs.
*/
public boolean hasTiffImageData() throws ImagingException {
- if (null != findField(TiffTagConstants.TIFF_TAG_TILE_OFFSETS)) {
+ if (findField(TiffTagConstants.TIFF_TAG_TILE_OFFSETS) != null) {
return true;
}
-
- return null != findField(TiffTagConstants.TIFF_TAG_STRIP_OFFSETS);
+ return findField(TiffTagConstants.TIFF_TAG_STRIP_OFFSETS) != null;
}
/**
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
index 8778c42e..577bea07 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
@@ -132,7 +132,7 @@ public class TiffImageMetadata extends GenericImageMetadata
{
final TiffMetadataItem item = (TiffMetadataItem) entry;
final TiffField srcField = item.getTiffField();
- if (null != dstDir.findField(srcField.getTag())) {
+ if (dstDir.findField(srcField.getTag()) != null) {
// ignore duplicate tags in a directory.
continue;
}
@@ -789,7 +789,7 @@ public class TiffImageMetadata extends GenericImageMetadata
{
for (final ImageMetadataItem srcDir1 : srcDirs) {
final Directory srcDir = (Directory) srcDir1;
- if (null != result.findDirectory(srcDir.type)) {
+ if (result.findDirectory(srcDir.type) != null) {
// Certain cameras right directories more than once.
// This is a bug.
// Ignore second directory of a given type.
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index aee69127..68637667 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -314,7 +314,7 @@ public class TiffImageParser extends
AbstractImageParser<TiffImagingParameters>
// dumpOptionalNumberTag(entries, TIFF_TAG_ORIENTATION);
// dumpOptionalNumberTag(entries, TIFF_TAG_PLANAR_CONFIGURATION);
final TiffField predictorField =
directory.findField(TiffTagConstants.TIFF_TAG_PREDICTOR);
- if (null != predictorField) {
+ if (predictorField != null) {
predictor = predictorField.getIntValueOrArraySum();
}
}
@@ -791,7 +791,7 @@ public class TiffImageParser extends
AbstractImageParser<TiffImagingParameters>
// dumpOptionalNumberTag(entries, TIFF_TAG_ORIENTATION);
// dumpOptionalNumberTag(entries, TIFF_TAG_PLANAR_CONFIGURATION);
final TiffField predictorField =
directory.findField(TiffTagConstants.TIFF_TAG_PREDICTOR);
- if (null != predictorField) {
+ if (predictorField != null) {
predictor = predictorField.getIntValueOrArraySum();
}
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
index 8cc8c574..21fbd6ea 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
@@ -216,7 +216,7 @@ public class TiffReader extends BinaryFileParser {
//
int rowsPerStrip = Integer.MAX_VALUE;
- if (null != rowsPerStripField) {
+ if (rowsPerStripField != null) {
rowsPerStrip = rowsPerStripField.getIntValue();
} else {
final TiffField imageHeight =
directory.findField(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH);
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
index 2014e1c7..ec78aa3b 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/AbstractTiffImageWriter.java
@@ -320,7 +320,7 @@ public abstract class AbstractTiffImageWriter {
// set up chain of directory references for "normal" directories.
final TiffOutputDirectory directory = directoryTypeMap.get(index);
- if (null != previousDirectory) {
+ if (previousDirectory != null) {
previousDirectory.setNextDirectory(directory);
}
previousDirectory = directory;
@@ -611,7 +611,7 @@ public abstract class AbstractTiffImageWriter {
directory.add(TiffTagConstants.TIFF_TAG_T6_OPTIONS, t6Options);
}
- if (null != xmpXml) {
+ if (xmpXml != null) {
final byte[] xmpXmlBytes = xmpXml.getBytes(StandardCharsets.UTF_8);
directory.add(TiffTagConstants.TIFF_TAG_XMP, xmpXmlBytes);
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
index cc5faa51..5303f650 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
@@ -154,7 +154,7 @@ public class TiffImageWriterLossless extends
AbstractTiffImageWriter {
}
index = lastElementByte;
}
- if (null != start) {
+ if (start != null) {
rewritableElements.add(new
AbstractTiffElement.Stub(start.offset, (int) (index - start.offset)));
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
index 67ebf716..bd1e8f03 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
@@ -741,7 +741,7 @@ public final class TiffOutputDirectory extends
AbstractTiffOutputItem implements
removeFieldIfPresent(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
TiffOutputField jpegOffsetField = null;
- if (null != jpegImageData) {
+ if (jpegImageData != null) {
jpegOffsetField = new
TiffOutputField(TiffTagConstants.TIFF_TAG_JPEG_INTERCHANGE_FORMAT,
AbstractFieldType.LONG, 1,
new byte[ENTRY_MAX_VALUE_LENGTH]);
add(jpegOffsetField);
@@ -761,7 +761,7 @@ public final class TiffOutputDirectory extends
AbstractTiffOutputItem implements
final TiffOutputField imageDataOffsetField;
ImageDataOffsets imageDataInfo = null;
- if (null != abstractTiffImageData) {
+ if (abstractTiffImageData != null) {
final boolean stripsNotTiles =
abstractTiffImageData.stripsNotTiles();
final TagInfo offsetTag;
@@ -808,13 +808,13 @@ public final class TiffOutputDirectory extends
AbstractTiffOutputItem implements
// outputSummary.add(item, field);
}
- if (null != imageDataInfo) {
+ if (imageDataInfo != null) {
Collections.addAll(result, imageDataInfo.outputItems);
outputSummary.addTiffImageData(imageDataInfo);
}
- if (null != jpegImageData) {
+ if (jpegImageData != null) {
final AbstractTiffOutputItem item = new
AbstractTiffOutputItem.Value("JPEG image data", jpegImageData.getData());
result.add(item);
outputSummary.add(item, jpegOffsetField);
@@ -881,7 +881,7 @@ public final class TiffOutputDirectory extends
AbstractTiffOutputItem implements
private void removeFieldIfPresent(final TagInfo tagInfo) {
final TiffOutputField field = findField(tagInfo);
- if (null != field) {
+ if (field != null) {
fields.remove(field);
}
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
index 8eaf101d..3a593702 100644
---
a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
+++
b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
@@ -67,7 +67,7 @@ public final class TiffOutputSet implements
Iterable<TiffOutputDirectory> {
* @throws ImagingException if a directory of that type already exists.
*/
public void addDirectory(final TiffOutputDirectory directory) throws
ImagingException {
- if (null != findDirectory(directory.getType())) {
+ if (findDirectory(directory.getType()) != null) {
throw new ImagingException("Output set already contains a
directory of that type.");
}
directories.add(directory);
@@ -154,7 +154,7 @@ public final class TiffOutputSet implements
Iterable<TiffOutputDirectory> {
public TiffOutputField findField(final int tag) {
for (final TiffOutputDirectory directory : directories) {
final TiffOutputField field = directory.findField(tag);
- if (null != field) {
+ if (field != null) {
return field;
}
}
@@ -218,7 +218,7 @@ public final class TiffOutputSet implements
Iterable<TiffOutputDirectory> {
getOrCreateRootDirectory();
final TiffOutputDirectory result =
findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_EXIF);
- if (null != result) {
+ if (result != null) {
return result;
}
return addExifDirectory();
@@ -235,7 +235,7 @@ public final class TiffOutputSet implements
Iterable<TiffOutputDirectory> {
getOrCreateExifDirectory();
final TiffOutputDirectory result =
findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_GPS);
- if (null != result) {
+ if (result != null) {
return result;
}
return addGpsDirectory();
@@ -249,7 +249,7 @@ public final class TiffOutputSet implements
Iterable<TiffOutputDirectory> {
*/
public TiffOutputDirectory getOrCreateRootDirectory() throws
ImagingException {
final TiffOutputDirectory result =
findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_ROOT);
- if (null != result) {
+ if (result != null) {
return result;
}
return addRootDirectory();
diff --git
a/src/main/java/org/apache/commons/imaging/mylzw/MyLzwCompressor.java
b/src/main/java/org/apache/commons/imaging/mylzw/MyLzwCompressor.java
index 30aa9320..95b55ab2 100644
--- a/src/main/java/org/apache/commons/imaging/mylzw/MyLzwCompressor.java
+++ b/src/main/java/org/apache/commons/imaging/mylzw/MyLzwCompressor.java
@@ -166,7 +166,7 @@ public class MyLzwCompressor {
clearCode = 1 << initialCodeSize;
eoiCode = clearCode + 1;
- if (null != listener) {
+ if (listener != null) {
listener.init(clearCode, eoiCode);
}
@@ -293,7 +293,7 @@ public class MyLzwCompressor {
}
private void writeClearCode(final MyBitOutputStream bos) throws
IOException {
- if (null != listener) {
+ if (listener != null) {
listener.dataCode(clearCode);
}
writeCode(bos, clearCode);
@@ -304,14 +304,14 @@ public class MyLzwCompressor {
}
private void writeDataCode(final MyBitOutputStream bos, final int code)
throws IOException {
- if (null != listener) {
+ if (listener != null) {
listener.dataCode(code);
}
writeCode(bos, code);
}
private void writeEoiCode(final MyBitOutputStream bos) throws IOException {
- if (null != listener) {
+ if (listener != null) {
listener.eoiCode(eoiCode);
}
writeCode(bos, eoiCode);
diff --git
a/src/main/java/org/apache/commons/imaging/mylzw/MyLzwDecompressor.java
b/src/main/java/org/apache/commons/imaging/mylzw/MyLzwDecompressor.java
index 835b6ce5..f4f596b2 100644
--- a/src/main/java/org/apache/commons/imaging/mylzw/MyLzwDecompressor.java
+++ b/src/main/java/org/apache/commons/imaging/mylzw/MyLzwDecompressor.java
@@ -95,7 +95,7 @@ public final class MyLzwDecompressor {
clearCode = 1 << initialCodeSize;
eoiCode = clearCode + 1;
- if (null != listener) {
+ if (listener != null) {
listener.init(clearCode, eoiCode);
}
@@ -192,7 +192,7 @@ public final class MyLzwDecompressor {
private int getNextCode(final MyBitInputStream is) throws IOException {
final int code = is.readBits(codeSize);
- if (null != listener) {
+ if (listener != null) {
listener.code(code);
}
return code;
diff --git
a/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
b/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
index fc05a880..12a00d65 100644
--- a/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
+++ b/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
@@ -72,9 +72,9 @@ public class MetadataExample {
// simple interface to GPS data
final TiffImageMetadata exifMetadata = jpegMetadata.getExif();
- if (null != exifMetadata) {
+ if (exifMetadata != null) {
final TiffImageMetadata.GpsInfo gpsInfo =
exifMetadata.getGpsInfo();
- if (null != gpsInfo) {
+ if (gpsInfo != null) {
final String gpsDescription = gpsInfo.toString();
final double longitude =
gpsInfo.getLongitudeAsDegreesEast();
final double latitude =
gpsInfo.getLatitudeAsDegreesNorth();
diff --git
a/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
b/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
index 4a4b3749..35f270e6 100644
---
a/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
+++
b/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
@@ -55,11 +55,11 @@ public class WriteExifMetadataExample {
// note that metadata might be null if no metadata is found.
final ImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata)
metadata;
- if (null != jpegMetadata) {
+ if (jpegMetadata != null) {
// note that exif might be null if no Exif metadata is found.
final TiffImageMetadata exif = jpegMetadata.getExif();
- if (null != exif) {
+ if (exif != null) {
// TiffImageMetadata class is immutable (read-only).
// TiffOutputSet class represents the Exif data to write.
//
@@ -143,11 +143,11 @@ public class WriteExifMetadataExample {
// note that metadata might be null if no metadata is found.
final ImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata)
metadata;
- if (null != jpegMetadata) {
+ if (jpegMetadata != null) {
// note that exif might be null if no Exif metadata is found.
final TiffImageMetadata exif = jpegMetadata.getExif();
- if (null != exif) {
+ if (exif != null) {
// TiffImageMetadata class is immutable (read-only).
// TiffOutputSet class represents the Exif data to write.
//
@@ -186,7 +186,7 @@ public class WriteExifMetadataExample {
// the constants in ExifTagConstants.java or go to Phil
Harvey's
// EXIF website.
final TiffOutputDirectory exifDirectory =
outputSet.getExifDirectory();
- if (null != exifDirectory) {
+ if (exifDirectory != null) {
exifDirectory.removeField(ExifTagConstants.EXIF_TAG_APERTURE_VALUE);
}
}
@@ -212,11 +212,11 @@ public class WriteExifMetadataExample {
// note that metadata might be null if no metadata is found.
final ImageMetadata metadata = Imaging.getMetadata(jpegImageFile);
final JpegImageMetadata jpegMetadata = (JpegImageMetadata)
metadata;
- if (null != jpegMetadata) {
+ if (jpegMetadata != null) {
// note that exif might be null if no Exif metadata is found.
final TiffImageMetadata exif = jpegMetadata.getExif();
- if (null != exif) {
+ if (exif != null) {
// TiffImageMetadata class is immutable (read-only).
// TiffOutputSet class represents the Exif data to write.
//
diff --git
a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java
b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java
index 74ae5969..58c95ff1 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFile.java
@@ -185,7 +185,7 @@ public class SurveyTiffFile {
int predictor = -1;
final TiffField predictorField =
directory.findField(TiffTagConstants.TIFF_TAG_PREDICTOR);
- if (null != predictorField) {
+ if (predictorField != null) {
predictor = predictorField.getIntValueOrArraySum();
}
@@ -337,7 +337,7 @@ public class SurveyTiffFile {
if (imageDataInStrips) {
final TiffField rowsPerStripField =
directory.findField(TiffTagConstants.TIFF_TAG_ROWS_PER_STRIP);
rowsPerStrip = Integer.MAX_VALUE;
- if (null != rowsPerStripField) {
+ if (rowsPerStripField != null) {
rowsPerStrip = rowsPerStripField.getIntValue();
} else {
final TiffField imageHeight =
directory.findField(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH);
