Changeset 10446 in josm for trunk/src/org/openstreetmap/josm/io

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/io

Files:

• GpxExporter.java (modified) (1 diff)
• remotecontrol/AddTagsDialog.java (modified) (2 diffs)
• remotecontrol/handler/AddNodeHandler.java (modified) (1 diff)
• remotecontrol/handler/AddWayHandler.java (modified) (1 diff)
• remotecontrol/handler/LoadAndZoomHandler.java (modified) (5 diffs)
• remotecontrol/handler/LoadObjectHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -172 +172 @@
             gpxData = ((GpxLayer) layer).data;
         } else {
-            gpxData = OsmDataLayer.toGpxData(Main.main.getCurrentDataSet(), file);
+            gpxData = OsmDataLayer.toGpxData(Main.getLayerManager().getEditDataSet(), file);
         }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -242 +242 @@
     protected void buttonAction(int buttonIndex, ActionEvent evt) {
         // if layer all layers were closed, ignore all actions
-        if (Main.main.getCurrentDataSet() != null && buttonIndex != 2) {
+        if (Main.getLayerManager().getEditDataSet() != null && buttonIndex != 2) {
             TableModel tm = propertyTable.getModel();
             for (int i = 0; i < tm.getRowCount(); i++) {
@@ -304 +304 @@
     public static void addTags(String[][] keyValue, String sender, Collection<? extends OsmPrimitive> primitives) {
         if (trustedSenders.contains(sender)) {
-            if (Main.main.getCurrentDataSet() != null) {
+            if (Main.getLayerManager().getEditDataSet() != null) {
                 for (String[] row : keyValue) {
                     Main.main.undoRedo.add(new ChangePropertyCommand(primitives, row[0], row[1]));

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -102 +102 @@
         }
 
-        Main.main.getCurrentDataSet().setSelected(node);
+        Main.getLayerManager().getEditDataSet().setSelected(node);
         if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
             AutoScaleAction.autoScale("selection");

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -171 +171 @@
         commands.add(new AddCommand(way));
         Main.main.undoRedo.add(new SequenceCommand(tr("Add way"), commands));
-        Main.main.getCurrentDataSet().setSelected(way);
+        Main.getLayerManager().getEditDataSet().setSelected(way);
         if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
             AutoScaleAction.autoScale("selection");

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -119 +119 @@
                         // find out whether some data has already been downloaded
                         Area present = null;
-                        DataSet ds = Main.main.getCurrentDataSet();
+                        DataSet ds = Main.getLayerManager().getEditDataSet();
                         if (ds != null) {
                             present = ds.getDataSourceArea();
@@ -158 +158 @@
                 @Override
                 public void run() {
-                    DataSet ds = Main.main.getCurrentDataSet();
+                    DataSet ds = Main.getLayerManager().getEditDataSet();
                     if (ds == null) // e.g. download failed
                         return;
@@ -174 +174 @@
                 public void run() {
                     Set<OsmPrimitive> newSel = new HashSet<>();
-                    DataSet ds = Main.main.getCurrentDataSet();
+                    DataSet ds = Main.getLayerManager().getEditDataSet();
                     if (ds == null) // e.g. download failed
                         return;
@@ -200 +200 @@
                     @Override
                     public void run() {
-                        final DataSet ds = Main.main.getCurrentDataSet();
+                        final DataSet ds = Main.getLayerManager().getEditDataSet();
                         final Collection<OsmPrimitive> filteredPrimitives = Utils.filter(ds.allPrimitives(), search);
                         ds.setSelected(filteredPrimitives);
@@ -221 +221 @@
                 @Override
                 public void run() {
-                    if (Main.main.getCurrentDataSet() != null) {
+                    if (Main.getLayerManager().getEditDataSet() != null) {
                         if (args.containsKey("changeset_comment")) {
-                            Main.main.getCurrentDataSet().addChangeSetTag("comment", args.get("changeset_comment"));
+                            Main.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment"));
                         }
                         if (args.containsKey("changeset_source")) {
-                            Main.main.getCurrentDataSet().addChangeSetTag("source", args.get("changeset_source"));
+                            Main.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source"));
                         }
                     }

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java

@@ -72 +72 @@
                 public void run() {
                     final List<PrimitiveId> downloaded = task.getDownloadedId();
-                    final DataSet ds = Main.main.getCurrentDataSet();
+                    final DataSet ds = Main.getLayerManager().getEditDataSet();
                     if (downloaded != null) {
                         GuiHelper.runInEDT(new Runnable() {