Changeset 19328 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2025-02-19T18:20:12+01:00 (6 weeks ago)

Author:

stoecker

Message:

see #24104 - removed deprecated functions

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -179 +179 @@
 
     /**
-     * Joins a list of strings (or objects that can be converted to string via
-     * Object.toString()) into a single string with fields separated by sep.
-     * @param sep the separator
-     * @param values collection of objects, null is converted to the
-     *  empty string
-     * @return null if values is null. The joined string otherwise.
-     * @deprecated since 15718, use {@link String#join} or {@link Collectors#joining}
-     */
-    @Deprecated(since = "15718", forRemoval = true)
-    public static String join(String sep, Collection<?> values) {
-        CheckParameterUtil.ensureParameterNotNull(sep, "sep");
-        if (values == null)
-            return null;
-        return values.stream()
-                .map(v -> v != null ? v.toString() : "")
-                .collect(Collectors.joining(sep));
-    }
-
-    /**
      * Converts the given iterable collection as an unordered HTML list.
      * @param values The iterable collection
@@ -1504 +1485 @@
 
     /**
-     * Reads the input stream and closes the stream at the end of processing (regardless if an exception was thrown)
-     *
-     * @param stream input stream
-     * @return byte array of data in input stream (empty if stream is null)
-     * @throws IOException if any I/O error occurs
-     * @deprecated since 19050 -- use {@link InputStream#readAllBytes()} instead
-     */
-    @Deprecated(since = "19050", forRemoval = true)
-    public static byte[] readBytesFromStream(InputStream stream) throws IOException {
-        if (stream == null) {
-            return new byte[0];
-        }
-        return stream.readAllBytes();
-    }
-
-    /**
      * Returns the initial capacity to pass to the HashMap / HashSet constructor
      * when it is initialized with a known number of entries.
@@ -1826 +1791 @@
         // See http://stackoverflow.com/a/16200769/2257172
         return isClassFound("javax.jnlp.ServiceManager");
-    }
-
-    /**
-     * Determines whether JOSM has been started via Oracle Java Web Start.
-     * @return true if JOSM has been started via Oracle Java Web Start
-     * @since 15740
-     * @deprecated JOSM no longer supports Oracle Java Webstart since Oracle Java Webstart doesn't support Java 9+.
-     */
-    @Deprecated(since = "19101", forRemoval = true)
-    public static boolean isRunningJavaWebStart() {
-        return isRunningWebStart() && isClassFound("com.sun.javaws.Main");
     }