Changeset 10382 in josm for trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

Timestamp:

2016-06-15T12:45:52+02:00 (10 years ago)

Author:

Don-vip

Message:

see #12943 - gsoc-core - fix most of deprecation warnings (static accesses must be fixed)

File:

• trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified) (3 diffs)

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

@@ -58 +58 @@
     @Override
     protected void updateEnabledState() {
-        if (getCurrentDataSet() == null) {
+        DataSet ds = getLayerManager().getEditDataSet();
+        if (ds == null) {
             setEnabled(false);
         } else {
-            updateEnabledState(getCurrentDataSet().getAllSelected());
+            updateEnabledState(ds.getAllSelected());
         }
     }
@@ -94 +95 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
         if (!isEnabled())
             return;
-        if (getEditLayer().isUploadDiscouraged()) {
-            if (UploadAction.warnUploadDiscouraged(getEditLayer())) {
+        if (editLayer.isUploadDiscouraged()) {
+            if (UploadAction.warnUploadDiscouraged(editLayer)) {
                 return;
             }
         }
-        Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(getEditLayer().data.getAllSelected());
-        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(getEditLayer().data);
+        Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(editLayer.data.getAllSelected());
+        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(editLayer.data);
         if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) {
             JOptionPane.showMessageDialog(
@@ -130 +132 @@
             return;
         }
-        uploadPrimitives(getEditLayer(), toUpload);
+        uploadPrimitives(editLayer, toUpload);
     }