Changeset 33694 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java

Timestamp:

2017-10-03T22:34:26+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm15320

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DuplicateChosenRelationAction.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -17 +18 @@
 
 public class DuplicateChosenRelationAction extends AbstractAction implements ChosenRelationListener {
-    private ChosenRelation rel;
+    private final ChosenRelation rel;
 
     public DuplicateChosenRelationAction(ChosenRelation rel) {
@@ -30 +31 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Relation r = rel.get();
-        Relation copy = new Relation(r, true);
-        MainApplication.undoRedo.add(new AddCommand(copy));
-        rel.set(copy);
-        if (MainApplication.getLayerManager().getEditDataSet() != null) {
-            MainApplication.getLayerManager().getEditDataSet().setSelected(copy);
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+        if (ds != null) {
+            Relation r = rel.get();
+            Relation copy = new Relation(r, true);
+            MainApplication.undoRedo.add(new AddCommand(ds, copy));
+            rel.set(copy);
+            ds.setSelected(copy);
         }
     }