Changeset 18014 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2021-07-13T23:56:50+02:00 (3 years ago)

Author:

Don-vip

Message:

remove deprecated stuff not used by plugins

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (1 diff)
• OpenFileAction.java (modified) (3 diffs)
• SimplifyWayAction.java (modified) (1 diff)

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

@@ -51 +51 @@
             String toolbarId, boolean installAdapters) {
         super(name, iconName, tooltip, shortcut, register, toolbarId, installAdapters);
-    }
-
-    /**
-     * Asks user confirmation before launching a large number of browser windows.
-     * @param numBrowsers the number of browser windows to open
-     * @return {@code true} if the user confirms, {@code false} otherwise
-     * @deprecated use {@link OpenBrowserAction#confirmLaunchMultiple(int)}
-     */
-    @Deprecated
-    public static boolean confirmLaunchMultiple(int numBrowsers) {
-        return OpenBrowserAction.confirmLaunchMultiple(numBrowsers);
     }
 

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

@@ -83 +83 @@
         File[] files = fc.getSelectedFiles();
         OpenFileTask task = new OpenFileTask(Arrays.asList(files), fc.getFileFilter());
-        task.setRecordHistory(true);
+        task.setOptions(Options.RECORD_HISTORY);
         MainApplication.worker.submit(task);
     }
@@ -101 +101 @@
     public static Future<?> openFiles(List<File> fileList) {
         return openFiles(fileList, (Options[]) null);
-    }
-
-    /**
-     * Open a list of files. The complete list will be passed to batch importers.
-     * @param fileList A list of files
-     * @param recordHistory {@code true} to save filename in history (default: false)
-     * @return the future task
-     * @since 11986 (return task)
-     * @deprecated Since 17534, use {@link OpenFileAction#openFiles(List, Options...)} with {@link Options#RECORD_HISTORY} instead.
-     */
-    @Deprecated
-    public static Future<?> openFiles(List<File> fileList, boolean recordHistory) {
-        Options[] options = recordHistory ? new Options[] {Options.RECORD_HISTORY} : null;
-        return openFiles(fileList, options);
     }
 
@@ -181 +167 @@
         public OpenFileTask(List<File> files, FileFilter fileFilter) {
             this(files, fileFilter, tr("Opening files"));
-        }
-
-        /**
-         * Sets whether to save filename in history (for list of recently opened files).
-         * @param recordHistory {@code true} to save filename in history (default: false)
-         * @deprecated since 17534 (use {@link #setOptions} instead).
-         */
-        @Deprecated
-        public void setRecordHistory(boolean recordHistory) {
-            if (recordHistory) {
-                this.options.add(Options.RECORD_HISTORY);
-            } else {
-                this.options.remove(Options.RECORD_HISTORY);
-            }
         }
 

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

@@ -325 +325 @@
      * @param w the way to simplify
      * @return The sequence of commands to run
-     * @since 6411
-     * @deprecated Replaced by {@link #createSimplifyCommand(Way)}. You can also use {@link #simplifyWays(List, double)} directly.
-     */
-    @Deprecated
-    public final SequenceCommand simplifyWay(Way w) {
-        return createSimplifyCommand(w);
-    }
-
-    /**
-     * Creates the SequenceCommand to simplify a way with a given threshold.
-     *
-     * @param w the way to simplify
-     * @param threshold the max error threshold
-     * @return The sequence of commands to run
-     * @since 6411
-     * @deprecated Replaced by {@link #createSimplifyCommand(Way, double)}. You can also use {@link #simplifyWays(List, double)} directly.
-     */
-    @Deprecated
-    public static SequenceCommand simplifyWay(Way w, double threshold) {
-        return createSimplifyCommand(w, threshold);
-    }
-
-    /**
-     * Creates the SequenceCommand to simplify a way with default threshold.
-     *
-     * @param w the way to simplify
-     * @return The sequence of commands to run
      * @since 15419
      */