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

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

Files:

• ApiPreconditionCheckerHook.java (modified) (2 diffs)
• ValidateUploadHook.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java

@@ -73 +73 @@
                             JOptionPane.ERROR_MESSAGE
                     );
-                    Main.main.getCurrentDataSet().setSelected(Collections.singleton(osmPrimitive));
+                    Main.getLayerManager().getEditDataSet().setSelected(Collections.singleton(osmPrimitive));
                     return false;
                 }
@@ -90 +90 @@
                         JOptionPane.ERROR_MESSAGE
                 );
-                Main.main.getCurrentDataSet().setSelected(Collections.singleton(osmPrimitive));
+                Main.getLayerManager().getEditDataSet().setSelected(Collections.singleton(osmPrimitive));
                 return false;
             }

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -151 +151 @@
             OsmValidator.initializeErrorLayer();
             Main.map.validatorDialog.unfurlDialog();
-            Main.main.getCurrentDataSet().fireSelectionChanged();
+            Main.getLayerManager().getEditDataSet().fireSelectionChanged();
             return false;
         }