Changeset 15474 in josm for trunk/src

Timestamp:

2019-10-25T23:42:46+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17350 - don't fire post-save event when autosaving a file (patch by Bjoeni)

File:

• trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java

@@ -66 +66 @@
      * @param file Output file
      * @param layer Data layer. Must be an instance of {@link OsmDataLayer}.
-     * @param noBackup if {@code true}, the potential backup file created if the output file already exists will be deleted
-     *                 after a successful export
+     * @param isAutosave if {@code true}, the potential backup file created if the output file already exists will be deleted
+     *                   after a successful export and post-save events won't be fired
      * @throws IOException in case of IO errors
      * @throws InvalidPathException when file name cannot be converted into a Path
      * @throws IllegalArgumentException if {@code layer} is not an instance of {@code OsmDataLayer}
      */
-    public void exportData(File file, Layer layer, boolean noBackup) throws IOException {
+    public void exportData(File file, Layer layer, boolean isAutosave) throws IOException {
         if (!(layer instanceof OsmDataLayer)) {
             throw new IllegalArgumentException(
                     MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer.getClass().getName()));
         }
-        save(file, (OsmDataLayer) layer, noBackup);
+        save(file, (OsmDataLayer) layer, isAutosave);
     }
 
@@ -84 +84 @@
     }
 
-    private void save(File file, OsmDataLayer layer, boolean noBackup) throws IOException {
+    private void save(File file, OsmDataLayer layer, boolean isAutosave) throws IOException {
         File tmpFile = null;
         try {
@@ -99 +99 @@
 
             doSave(file, layer);
-            if ((noBackup || !Config.getPref().getBoolean("save.keepbackup", false)) && tmpFile != null) {
+            if ((isAutosave || !Config.getPref().getBoolean("save.keepbackup", false)) && tmpFile != null) {
                 Utils.deleteFile(tmpFile);
             }
-            layer.onPostSaveToFile();
+            if (!isAutosave) {
+                layer.onPostSaveToFile();
+            }
         } catch (IOException | InvalidPathException e) {
             Logging.error(e);