Changeset 7083 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java

Timestamp:

2014-05-09T06:03:50+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - replace Utils.equal by Objects.equals, new in Java 7

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
-
-import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
+import java.util.Objects;
 
 import javax.swing.ImageIcon;
@@ -19 +18 @@
 
 public class MapImage {
-    
+
     private static final int MAX_SIZE = 48;
-    
+
     /**
      * ImageIcon can change while the image is loading.
@@ -158 +157 @@
         return new MapImageBoxProvider();
     }
-    
+
     /**
      * Returns the really displayed node icon for this {@code MapImage}.
@@ -174 +173 @@
         }
     }
-    
+
     private boolean mustRescale(Image image) {
-        return ((width  == -1 && image.getWidth(null) > MAX_SIZE) 
+        return ((width  == -1 && image.getWidth(null) > MAX_SIZE)
              && (height == -1 && image.getHeight(null) > MAX_SIZE));
     }
@@ -187 +186 @@
         // img changes when image is fully loaded and can't be used for equality check.
         return  alpha == other.alpha &&
-                equal(name, other.name) &&
-                equal(source, other.source) &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(source, other.source) &&
                 width == other.width &&
                 height == other.height;