Changeset 10446 in josm for trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

Timestamp:

2016-06-21T00:58:45+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13001 - replace calls to Main.main.getCurrentDataSet() by Main.getLayerManager().getEditDataSet()

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -413 +413 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        join(Main.main.getCurrentDataSet().getSelectedWays());
+        join(Main.getLayerManager().getEditDataSet().getSelectedWays());
     }
 
@@ -1425 +1425 @@
         List<RelationRole> result = new ArrayList<>();
 
-        for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
+        for (Relation r : Main.getLayerManager().getEditDataSet().getRelations()) {
             if (r.isDeleted()) {
                 continue;