Index: /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java	(revision 10691)
+++ /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java	(revision 10692)
@@ -149,5 +149,5 @@
 
         /**
-         * Pastes the tags from a homogeneous source (the {@link Main#pasteBuffer}s selection consisting
+         * Pastes the tags from a homogeneous source (the selection consisting
          * of one type of {@link OsmPrimitive}s only).
          *
@@ -175,7 +175,5 @@
                 buildTags(dialog.getResolution());
             } else {
-                // no conflicts in the source tags to resolve. Just apply the tags
-                // to the target primitives
-                //
+                // no conflicts in the source tags to resolve. Just apply the tags to the target primitives
                 buildTags(tc);
             }
Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 10691)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 10692)
@@ -50,4 +50,5 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
@@ -748,5 +749,5 @@
     /**
      * Transforms the collection {@code c} into an unmodifiable collection and
-     * applies the {@link org.openstreetmap.josm.tools.Utils.Function} {@code f} on each element upon access.
+     * applies the {@link Function} {@code f} on each element upon access.
      * @param <A> class of input collection
      * @param <B> class of transformed collection
@@ -755,5 +756,5 @@
      * @return the transformed unmodifiable collection
      */
-    public static <A, B> Collection<B> transform(final Collection<? extends A> c, final java.util.function.Function<A, B> f) {
+    public static <A, B> Collection<B> transform(final Collection<? extends A> c, final Function<A, B> f) {
         return new AbstractCollection<B>() {
 
@@ -790,5 +791,5 @@
     /**
      * Transforms the list {@code l} into an unmodifiable list and
-     * applies the {@link org.openstreetmap.josm.tools.Utils.Function} {@code f} on each element upon access.
+     * applies the {@link Function} {@code f} on each element upon access.
      * @param <A> class of input collection
      * @param <B> class of transformed collection
@@ -797,5 +798,5 @@
      * @return the transformed unmodifiable list
      */
-    public static <A, B> List<B> transform(final List<? extends A> l, final java.util.function.Function<A, B> f) {
+    public static <A, B> List<B> transform(final List<? extends A> l, final Function<A, B> f) {
         return new AbstractList<B>() {