Changeset 11331 in josm

Timestamp:

2016-11-28T01:35:12+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/BufferedImageCacheEntry.java (modified) (1 diff)
• data/cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)
• gui/conflict/pair/AbstractListMerger.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java

@@ -44 +44 @@
                 return img;
             byte[] content = getContent();
-            if (content != null && content.length > 0) {
+            if (content.length > 0) {
                 img = ImageIO.read(new ByteArrayInputStream(content));
                 imageLoaded = true;

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -196 +196 @@
             return false;
         }
-        byte[] content = cacheData.getContent();
-        return content != null && content.length > 0;
+        return cacheData.getContent().length > 0;
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -124 +124 @@
             byte[] content = cacheData.getContent();
             try {
-                return content != null || cacheData.getImage() != null || isNoTileAtZoom();
+                return content.length > 0 || cacheData.getImage() != null || isNoTileAtZoom();
             } catch (IOException e) {
                 LOG.log(Level.WARNING, "JCS TMS - error loading from cache for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
@@ -325 +325 @@
         if (object != null) {
             byte[] content = object.getContent();
-            if (content != null && content.length > 0) {
+            if (content.length > 0) {
                 tile.loadImage(new ByteArrayInputStream(content));
                 if (tile.getImage() == null) {

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java

@@ -490 +490 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = myEntriesTable.getSelectedRows();
@@ -520 +520 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = myEntriesTable.getSelectedRows();
@@ -582 +582 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = theirEntriesTable.getSelectedRows();
@@ -608 +608 @@
         public void actionPerformed(ActionEvent e) {
             int[] mergedRows = mergedEntriesTable.getSelectedRows();
-            if (mergedRows == null || mergedRows.length == 0)
+            if (mergedRows.length == 0)
                 return;
             int[] myRows = theirEntriesTable.getSelectedRows();
@@ -703 +703 @@
         public void valueChanged(ListSelectionEvent e) {
             int[] rows = mergedEntriesTable.getSelectedRows();
-            setEnabled(
-                    rows != null
-                    && rows.length > 0
+            setEnabled(rows.length > 0
                     && rows[0] != 0
             );
@@ -737 +735 @@
         public void valueChanged(ListSelectionEvent e) {
             int[] rows = mergedEntriesTable.getSelectedRows();
-            setEnabled(
-                    rows != null
-                    && rows.length > 0
+            setEnabled(rows.length > 0
                     && rows[rows.length -1] != mergedEntriesTable.getRowCount() -1
             );
@@ -771 +767 @@
         public void valueChanged(ListSelectionEvent e) {
             int[] rows = mergedEntriesTable.getSelectedRows();
-            setEnabled(
-                    rows != null
-                    && rows.length > 0
-            );
+            setEnabled(rows.length > 0);
         }
     }