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

Timestamp:

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

Author:

Don-vip

Message:

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

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -342 +342 @@
 
         protected void setCurrentRelationAsSelection() {
-            MainApplication.getLayerManager().getEditDataSet().setSelected(displaylist.getSelectedValue());
+            MainApplication.getLayerManager().getActiveDataSet().setSelected(displaylist.getSelectedValue());
         }
 
@@ -351 +351 @@
         @Override
         public void mouseClicked(MouseEvent e) {
-            if (MainApplication.getLayerManager().getEditLayer() == null) return;
-            if (isDoubleClick(e)) {
-                if (e.isControlDown()) {
+            DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+            if (ds != null && isDoubleClick(e)) {
+                if (e.isControlDown() && !ds.isReadOnly()) {
                     editCurrentRelation();
                 } else {
@@ -733 +733 @@
             return;
         // trigger a sort of the relation list because the display name may have changed
-        //
         List<Relation> sel = model.getSelectedRelations();
         model.sort();
@@ -742 +741 @@
     @Override
     public void dataChanged(DataChangedEvent event) {
-        initFromLayer(MainApplication.getLayerManager().getEditLayer());
+        initFromLayer(MainApplication.getLayerManager().getActiveDataLayer());
     }