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

Timestamp:

2016-08-03T15:39:00+02:00 (8 years ago)

Author:

simon04

Message:

see #11390, see #12890 - Lambda can be replaced with method reference

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ExceptionUtil.java (modified) (2 diffs)
• MemoryManager.java (modified) (2 diffs)
• MultiLineFlowLayout.java (modified) (1 diff)
• Utils.java (modified) (2 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;
@@ -142 +141 @@
             OsmPrimitive firstRefs = conflict.b.iterator().next();
             String objId = Long.toString(conflict.a.getId());
-            Collection<Long> refIds = Utils.transform(conflict.b, (Function<OsmPrimitive, Long>) x -> x.getId());
+            Collection<Long> refIds = Utils.transform(conflict.b, OsmPrimitive::getId);
             String refIdsString = refIds.size() == 1 ? refIds.iterator().next().toString() : refIds.toString();
             if (conflict.a instanceof Node) {

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

@@ -87 +87 @@
      */
     public synchronized long getAvailableMemory() {
-        return getMaxMemory() - activeHandles.stream().mapToLong(h -> h.getSize()).sum();
+        return getMaxMemory() - activeHandles.stream().mapToLong(MemoryHandle::getSize).sum();
     }
 
@@ -104 +104 @@
     protected synchronized List<MemoryHandle<?>> resetState() {
         ArrayList<MemoryHandle<?>> toFree = new ArrayList<>(activeHandles);
-        toFree.stream().forEach(h -> h.free());
+        toFree.forEach(MemoryHandle::free);
         return toFree;
     }

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

@@ -48 +48 @@
     @Override
     public Dimension preferredLayoutSize(Container target) {
-        return getLayoutSize(target, c -> c.getPreferredSize());
+        return getLayoutSize(target, Component::getPreferredSize);
     }
 
     @Override
     public Dimension minimumLayoutSize(Container target) {
-        return getLayoutSize(target, c -> c.getMinimumSize());
+        return getLayoutSize(target, Component::getMinimumSize);
     }
 

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

@@ -319 +319 @@
      */
     public static String joinAsHtmlUnorderedList(Iterable<?> values) {
-        return StreamUtils.toStream(values.iterator()).map(x -> x.toString()).collect(StreamUtils.toHtmlList());
+        return StreamUtils.toStream(values.iterator()).map(Object::toString).collect(StreamUtils.toHtmlList());
     }
 
@@ -1341 +1341 @@
      */
     public static Executor newDirectExecutor() {
-        return command -> command.run();
+        return Runnable::run;
     }