Changeset 17556 in josm for trunk

Timestamp:

2021-03-08T20:45:04+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20310 - Update deprecated methods used elsewhere in JOSM core (patch by taylor.smock, modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenFileAction.java (modified) (1 diff)
• gui/MainApplication.java (modified) (2 diffs)
• gui/datatransfer/importers/FilePaster.java (modified) (2 diffs)
• gui/io/RecentlyOpenedFilesMenu.java (modified) (2 diffs)

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

@@ -201 +201 @@
          * @param options The options to set
          * @see Options
-         * @since 17534
-         */
-        public void setOptions(Options[] options) {
+         * @since 17556
+         */
+        public void setOptions(Options... options) {
             this.options.clear();
             if (options != null) {

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

@@ -106 +106 @@
 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;
@@ -1276 +1277 @@
         }
         if (!fileList.isEmpty()) {
-            tasks.add(OpenFileAction.openFiles(fileList, true));
+            tasks.add(OpenFileAction.openFiles(fileList, Options.RECORD_HISTORY));
         }
         for (String s : args.get(Option.DOWNLOADGPS)) {

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

@@ -13 +13 @@
 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;
 
@@ -34 +35 @@
         List<File> files = (List<File>) support.getTransferable().getTransferData(df);
         OpenFileAction.OpenFileTask task = new OpenFileAction.OpenFileTask(files, null);
-        task.setRecordHistory(true);
+        task.setOptions(Options.RECORD_HISTORY);
         MainApplication.worker.submit(task);
         return true;

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

@@ -19 +19 @@
 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;
@@ -85 +86 @@
         public void actionPerformed(ActionEvent e) {
             OpenFileTask task = new OpenFileTask(Collections.singletonList(new File(file)), null);
-            task.setRecordHistory(true);
+            task.setOptions(Options.RECORD_HISTORY);
             MainApplication.worker.submit(task);
         }