Changeset 10689 in josm

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Relation.java (modified) (2 diffs)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)
• gui/tagging/ac/AutoCompletionManager.java (modified) (2 diffs)
• io/MultiFetchOverpassObjectReader.java (modified) (2 diffs)
• io/remotecontrol/handler/ImageryHandler.java (modified) (2 diffs)
• tools/ExceptionUtil.java (modified) (2 diffs)
• tools/Utils.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.openstreetmap.josm.Main;
@@ -17 +18 @@
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.Utils.Function;
 
 /**

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -17 +17 @@
 import java.util.List;
 import java.util.TreeSet;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -40 +41 @@
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.Utils.Function;
 
 /**

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -13 +13 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.openstreetmap.josm.Main;
@@ -38 +39 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.Utils.Function;
 
 /**

trunk/src/org/openstreetmap/josm/io/MultiFetchOverpassObjectReader.java

@@ -3 +3 @@
 
 import java.util.Set;
+import java.util.function.Function;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -17 +18 @@
     @Override
     protected String buildRequestString(final OsmPrimitiveType type, Set<Long> idPackage) {
-        final Utils.Function<Long, Object> toOverpassExpression = x -> type.getAPIName() + '(' + x + ");>;";
+        final Function<Long, Object> toOverpassExpression = x -> type.getAPIName() + '(' + x + ");>;";
         final String query = '(' + Utils.join("", Utils.transform(idPackage, toOverpassExpression)) + ");out meta;";
         return "interpreter?data=" + Utils.encodeUrl(query);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java

@@ -5 +5 @@
 
 import java.util.Arrays;
+import java.util.function.Function;
 
 import org.openstreetmap.josm.Main;
@@ -14 +15 @@
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.Utils.Function;
 
 /**

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>() {