Changeset 30438 in osm for applications/editors/josm

Timestamp:

2014-05-09T06:00:14+02:00 (11 years ago)

Author:

donvip

Message:

[josm_roadsigns] see #josm8465 - replace call to Utils.equal by Objects.equals, new in Java 7

File:

• applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java

@@ -18 +18 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 import javax.swing.BorderFactory;
@@ -24 +25 @@
 
 import org.xml.sax.SAXException;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -149 +149 @@
             // change the current preset selection to custom directly
             String lastCustomFile = Main.pref.get("plugin.roadsigns.sources.last", null);
-            if (!Utils.equal(customFile, lastCustomFile)) {
+            if (!Objects.equals(customFile, lastCustomFile)) {
                 Main.pref.put("plugin.roadsigns.sources.last", customFile);
                 Main.pref.put("plugin.roadsigns.preset.selection", "custom");