Ticket #20310: 20310.deprecated_update.patch

src/org/openstreetmap/josm/gui/MainApplication.java

@@ -105 +105 @@
 import org.openstreetmap.josm.gui.io.CredentialDialog;
 import org.openstreetmap.josm.gui.io.CustomConfigurator.XMLCommandProcessor;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
+import org.openstreetmap.josm.gui.io.importexport.Options;
 import org.openstreetmap.josm.gui.layer.AutosaveTask;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
@@ -1275 +1276 @@
             tasks.addAll(DownloadParamType.paramType(s).download(s, fileList));
         }
         if (!fileList.isEmpty()) {
-            tasks.add(OpenFileAction.openFiles(fileList, true));
+            tasks.add(OpenFileAction.openFiles(fileList, Options.RECORD_HISTORY));
         }
         for (String s : args.get(Option.DOWNLOADGPS)) {
             tasks.addAll(DownloadParamType.paramType(s).downloadGps(s));

src/org/openstreetmap/josm/gui/datatransfer/importers/FilePaster.java

@@ -12 +12 @@
 import org.openstreetmap.josm.actions.OpenFileAction;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.io.importexport.Options;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -33 +34 @@
         @SuppressWarnings("unchecked")
         List<File> files = (List<File>) support.getTransferable().getTransferData(df);
         OpenFileAction.OpenFileTask task = new OpenFileAction.OpenFileTask(files, null);
-        task.setRecordHistory(true);
+        task.setOptions(new Options[] {Options.RECORD_HISTORY});
         MainApplication.worker.submit(task);
         return true;
     }

src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -18 +18 @@
 
 import org.openstreetmap.josm.actions.OpenFileAction.OpenFileTask;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.io.importexport.Options;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -84 +85 @@
         @Override
         public void actionPerformed(ActionEvent e) {
             OpenFileTask task = new OpenFileTask(Collections.singletonList(new File(file)), null);
-            task.setRecordHistory(true);
+            task.setOptions(new Options[] {Options.RECORD_HISTORY});
             MainApplication.worker.submit(task);
         }
     }