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

Timestamp:

2016-06-21T01:29:31+02:00 (8 years ago)

Author:

Don-vip

Message:

fix more deprecation warnings

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -268 +268 @@
                 // which would make this variable true. Of course we only want the popup to show
                 // if the middle mouse button has been pressed in the first place
-                boolean mouseNotMoved = oldMousePos != null
-                        && oldMousePos.equals(ms.mousePos);
+                boolean mouseNotMoved = oldMousePos != null && oldMousePos.equals(ms.mousePos);
                 boolean isAtOldPosition = mouseNotMoved && popup != null;
                 boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
                 try {
-                    ds = mv.getCurrentDataSet();
+                    ds = mv.getLayerManager().getEditDataSet();
                     if (ds != null) {
                         // This is not perfect, if current dataset was changed during execution, the lock would be useless