Changeset 2250 in josm for trunk/src/org/openstreetmap/josm/actions/UploadAction.java

Timestamp:

2009-10-05T21:39:15+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3653: History for anonymous users should not be clickable
fixed #3518: Provide a new feature for uploading the currently selected primitives

File:

• trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) (2 diffs)

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

@@ -152 +152 @@
     }
 
+    public void uploadData(OsmDataLayer layer, APIDataSet apiData) {
+        if (apiData.isEmpty()) {
+            JOptionPane.showMessageDialog(
+                    Main.parent,
+                    tr("No changes to upload."),
+                    tr("Warning"),
+                    JOptionPane.INFORMATION_MESSAGE
+            );
+            return;
+        }
+        if (!checkPreUploadConditions(layer, apiData))
+            return;
+        Main.worker.execute(
+                createUploadTask(
+                        layer,
+                        apiData.getPrimitives(),
+                        UploadDialog.getUploadDialog().getChangeset(),
+                        UploadDialog.getUploadDialog().isDoCloseAfterUpload()
+                )
+        );
+    }
+
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled())
@@ -164 +186 @@
             return;
         }
-
         APIDataSet apiData = new APIDataSet(Main.main.getCurrentDataSet());
-        if (apiData.isEmpty()) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("No changes to upload."),
-                    tr("Warning"),
-                    JOptionPane.INFORMATION_MESSAGE
-            );
-            return;
-        }
-        if (!checkPreUploadConditions(Main.map.mapView.getEditLayer(), apiData))
-            return;
-        Main.worker.execute(
-                createUploadTask(
-                        Main.map.mapView.getEditLayer(),
-                        apiData.getPrimitives(),
-                        UploadDialog.getUploadDialog().getChangeset(),
-                        UploadDialog.getUploadDialog().isDoCloseAfterUpload()
-                )
-        );
+        uploadData(Main.map.mapView.getEditLayer(), apiData);
     }