Changeset 10446 in josm for trunk/src/org/openstreetmap/josm/actions/relation

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()

Location:

trunk/src/org/openstreetmap/josm/actions/relation

Files:

• AddSelectionToRelations.java (modified) (1 diff)
• RecentRelationsAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/AddSelectionToRelations.java

@@ -39 +39 @@
         Collection<Command> cmds = new LinkedList<>();
         for (Relation orig : relations) {
-            Command c = GenericRelationEditor.addPrimitivesToRelation(orig, Main.main.getCurrentDataSet().getSelected());
+            Command c = GenericRelationEditor.addPrimitivesToRelation(orig, Main.getLayerManager().getEditDataSet().getSelected());
             if (c != null) {
                 cmds.add(c);

trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java

@@ -100 +100 @@
         return relation != null &&
             !relation.isDeleted() &&
-            Main.main.getCurrentDataSet().containsRelation(relation);
+            Main.getLayerManager().getEditDataSet().containsRelation(relation);
     }