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

Timestamp:

2021-09-11T17:00:13+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21257 - sort tracks chronologically when writing GPX file

File:

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

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

@@ -650 +650 @@
     public static <T> List<T> toUnmodifiableList(Collection<T> collection) {
         // Java 9: use List.of(...)
-        if (collection == null || collection.isEmpty()) {
+        if (isEmpty(collection)) {
             return Collections.emptyList();
         } else if (collection.size() == 1) {
@@ -672 +672 @@
     @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> toUnmodifiableMap(Map<K, V> map) {
-        if (map == null || map.isEmpty()) {
+        if (isEmpty(map)) {
             return Collections.emptyMap();
         } else if (map.size() == 1) {
@@ -689 +689 @@
 
     /**
+     * Determines if a collection is null or empty.
+     * @param collection collection
+     * @return {@code true} if collection is null or empty
+     * @since 18207
+     */
+    public static boolean isEmpty(Collection<?> collection) {
+        return collection == null || collection.isEmpty();
+    }
+
+    /**
+     * Determines if a map is null or empty.
+     * @param map map
+     * @return {@code true} if map is null or empty
+     * @since 18207
+     */
+    public static boolean isEmpty(Map<?, ?> map) {
+        return map == null || map.isEmpty();
+    }
+
+    /**
+     * Determines if a string is null or empty.
+     * @param string string
+     * @return {@code true} if string is null or empty
+     * @since 18207
+     */
+    public static boolean isEmpty(String string) {
+        return string == null || string.isEmpty();
+    }
+
+    /**
      * Returns the first not empty string in the given candidates, otherwise the default string.
      * @param defaultString default string returned if all candidates would be empty if stripped
@@ -737 +767 @@
      */
     public static String strip(final String str, final String skipChars) {
-        if (str == null || str.isEmpty()) {
+        if (isEmpty(str)) {
             return str;
         }
@@ -774 +804 @@
      */
     public static String removeWhiteSpaces(String s) {
-        if (s == null || s.isEmpty()) {
+        if (isEmpty(s)) {
             return s;
         }