Changeset 14143 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer

Timestamp:

2018-08-12T14:27:32+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.main - new class OsmDataManager

Location:

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers

Files:

• AbstractTagPaster.java (modified) (3 diffs)
• PrimitiveTagTransferPaster.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/AbstractTagPaster.java

@@ -14 +14 @@
 import javax.swing.TransferHandler.TransferSupport;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -20 +19 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.OsmDataManager;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -49 +49 @@
     public boolean importTagsOn(TransferSupport support, Collection<? extends OsmPrimitive> selection)
             throws UnsupportedFlavorException, IOException {
-        ChangePropertyCommand command = new ChangePropertyCommand(Main.main.getEditDataSet(), selection, getTags(support));
+        ChangePropertyCommand command = new ChangePropertyCommand(OsmDataManager.getInstance().getEditDataSet(), selection, getTags(support));
         commitCommands(selection, Collections.singletonList(command));
         return true;

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmDataManager;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -53 +54 @@
             Map<String, String> tags = new HashMap<>(1);
             tags.put(tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue());
-            ChangePropertyCommand cmd = new ChangePropertyCommand(Main.main.getEditDataSet(), selection, tags);
+            ChangePropertyCommand cmd = new ChangePropertyCommand(OsmDataManager.getInstance().getEditDataSet(), selection, tags);
             if (cmd.getObjectsNumber() > 0) {
                 commands.add(cmd);