Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java

Timestamp:

2018-02-18T05:02:23+01:00 (6 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (4 diffs)

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

@@ -327 +327 @@
                 boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
 
-                ds = mv.getLayerManager().getEditDataSet();
+                ds = mv.getLayerManager().getActiveDataSet();
                 if (ds != null) {
                     // This is not perfect, if current dataset was changed during execution, the lock would be useless
@@ -512 +512 @@
          */
         private void popupCycleSelection(Collection<OsmPrimitive> osms, int mods) {
-            DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+            DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
             // Find some items that are required for cycling through
             OsmPrimitive firstItem = null;
@@ -603 +603 @@
          */
         private void popupSetLabelColors(JLabel lbl, OsmPrimitive osm) {
-            DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+            DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
             if (ds.isSelected(osm)) {
                 lbl.setBackground(SystemColor.textHighlight);
@@ -676 +676 @@
                 @Override
                 public void mouseClicked(MouseEvent e) {
-                    DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+                    DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
                     // Let the user toggle the selection
                     ds.toggleSelected(osm);