Changeset 10662 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-07-28T01:00:46+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12472, fix #13230, fix #13225, fix #13228 - disable ReferenceEquality warning + partial revert of r10656 + r10659, causes too much problems

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• dialogs/properties/TagEditHelper.java (modified) (1 diff)
• preferences/ToolbarPreferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -692 +692 @@
                     int i = 1;
                     for (RelationMember m : r.getMembers()) {
-                        if (primitive.equals(m.getMember())) {
+                        if (m.getMember() == primitive) {
                             mi.add(m, i);
                         }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -678 +678 @@
                 for (int i = 0; i < tagData.getRowCount(); ++i) {
                     if (item.getValue().equals(tagData.getValueAt(i, 0) /* sic! do not use getDataKey*/)) {
-                        if (item.equals(itemToSelect)) {
+                        if (itemToSelect == item) {
                             itemToSelect = null;
                         }

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -27 +27 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -660 +659 @@
             @Override
             public boolean isDataFlavorSupported(DataFlavor flavor) {
-                return Objects.equals(flavors[0], flavor);
+                return flavors[0] == flavor;
             }
         }