Changeset 6815 in josm for trunk/src

Timestamp:

2014-02-06T00:03:52+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9662 - correct handling of canceled gpx export

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveActionBase.java (modified) (2 diffs)
• io/FileExporter.java (modified) (2 diffs)
• io/GpxExporter.java (modified) (1 diff)

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

@@ -68 +68 @@
         try {
             boolean exported = false;
+            boolean canceled = false;
             for (FileExporter exporter : ExtensionFileFilter.exporters) {
                 if (exporter.acceptFile(file, layer)) {
                     exporter.exportData(file, layer);
                     exported = true;
+                    canceled = exporter.isCanceled();
                     break;
                 }
@@ -78 +80 @@
                 JOptionPane.showMessageDialog(Main.parent, tr("No Exporter found! Nothing saved."), tr("Warning"),
                         JOptionPane.WARNING_MESSAGE);
+                return false;
+            } else if (canceled) {
                 return false;
             }

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

@@ -16 +16 @@
 
     private boolean enabled;
+    private boolean canceled;
 
+    /**
+     * Constructs a new {@code FileExporter}.
+     * @param filter The extension file filter
+     */
     public FileExporter(ExtensionFileFilter filter) {
         this.filter = filter;
@@ -62 +67 @@
         // To be overriden by subclasses if needed
     }
+
+    /**
+     * Determines if this exporter has been canceled during export.
+     * @return true if this {@code FileExporter} has been canceled
+     * @since 6815
+     */
+    public final boolean isCanceled() {
+        return canceled;
+    }
+
+    /**
+     * Marks this exporter as canceled.
+     * @param canceled true to mark this exporter as canceled, {@code false} otherwise
+     * @since 6815
+     */
+    public final void setCanceled(boolean canceled) {
+        this.canceled = canceled;
+    }
 }

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

@@ -127 +127 @@
         ed.showDialog();
 
-        if (ed.getValue() != 1)
+        if (ed.getValue() != 1) {
+            setCanceled(true);
             return;
+        }
+        setCanceled(false);
 
         Main.pref.put("lastAddAuthor", author.isSelected());