Changeset 7083 in josm for trunk/src/org/openstreetmap/josm/Main.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/Main.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -27 +27 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.StringTokenizer;
 import java.util.concurrent.Callable;
@@ -181 +182 @@
      * The commands undo/redo handler.
      */
-    public UndoRedoHandler undoRedo = new UndoRedoHandler();
+    public final UndoRedoHandler undoRedo = new UndoRedoHandler();
 
     /**
@@ -580 +581 @@
         toolbar.control.updateUI();
         contentPanePrivate.updateUI();
-
     }
 
@@ -1123 +1123 @@
                 final String EXIT = tr("Exit JOSM");
                 final String CONTINUE = tr("Continue, try anyway");
-                int ret = JOptionPane.showOptionDialog(null, panel, tr("Error"), JOptionPane.YES_NO_OPTION, 
+                int ret = JOptionPane.showOptionDialog(null, panel, tr("Error"), JOptionPane.YES_NO_OPTION,
                         JOptionPane.ERROR_MESSAGE, null, new String[] {EXIT, CONTINUE}, EXIT);
                 if (ret == 0) {
@@ -1178 +1178 @@
     private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
         if (newValue == null ^ oldValue == null
-                || (newValue != null && oldValue != null && !Utils.equal(newValue.toCode(), oldValue.toCode()))) {
+                || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
 
             synchronized(Main.class) {