Changeset 15012 in josm for trunk/src/org

Timestamp:

2019-04-22T13:56:24+02:00 (6 years ago)

Author:

Don-vip

Message:

remove duplicated code

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -18 +18 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BiPredicate;
 
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -629 +630 @@
     }
 
-    /**
-     * Replies the value for key <code>key</code>. Replies null, if <code>key</code> is null.
-     * Replies null, if there is no value for the given key.
-     *
-     * @param key the key. Can be null, replies null in this case.
-     * @return the value for key <code>key</code>.
-     */
-    @Override
-    public final String get(String key) {
+    protected final String doGet(String key, BiPredicate<String, String> predicate) {
         if (key == null)
             return null;
@@ -643 +636 @@
             return null;
         for (int i = 0; i < keys.length; i += 2) {
-            if (keys[i].equals(key)) return keys[i+1];
+            if (predicate.test(keys[i], key)) return keys[i+1];
         }
         return null;
+    }
+
+    /**
+     * Replies the value for key <code>key</code>. Replies null, if <code>key</code> is null.
+     * Replies null, if there is no value for the given key.
+     *
+     * @param key the key. Can be null, replies null in this case.
+     * @return the value for key <code>key</code>.
+     */
+    @Override
+    public final String get(String key) {
+        return doGet(key, String::equals);
     }
 
@@ -654 +659 @@
      */
     public final String getIgnoreCase(String key) {
-        if (key == null)
-            return null;
-        if (keys == null)
-            return null;
-        for (int i = 0; i < keys.length; i += 2) {
-            if (keys[i].equalsIgnoreCase(key)) return keys[i+1];
-        }
-        return null;
+        return doGet(key, String::equalsIgnoreCase);
     }