Changeset 10689 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-07-31T14:11:38+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - Use Java 8 Function

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ExceptionUtil.java (modified) (2 diffs)
• Utils.java (modified) (4 diffs)

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

@@ -16 +16 @@
 import java.util.Date;
 import java.util.TreeSet;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -34 +35 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.tools.Utils.Function;
 import org.openstreetmap.josm.tools.date.DateUtils;
 

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

@@ -770 +770 @@
     @Deprecated
     @FunctionalInterface
-    public interface Function<A, B> {
+    public interface Function<A, B> extends java.util.function.Function<A, B> {
 
         /**
@@ -777 +777 @@
          * @return the transformed object
          */
+        @Override
         B apply(A x);
     }
@@ -789 +790 @@
      * @return the transformed unmodifiable collection
      */
-    public static <A, B> Collection<B> transform(final Collection<? extends A> c, final Function<A, B> f) {
+    public static <A, B> Collection<B> transform(final Collection<? extends A> c, final java.util.function.Function<A, B> f) {
         return new AbstractCollection<B>() {
 
@@ -831 +832 @@
      * @return the transformed unmodifiable list
      */
-    public static <A, B> List<B> transform(final List<? extends A> l, final Function<A, B> f) {
+    public static <A, B> List<B> transform(final List<? extends A> l, final java.util.function.Function<A, B> f) {
         return new AbstractList<B>() {