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

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

Files:

• actions/UnGlueAction.java (modified) (1 diff)
• actions/relation/DownloadSelectedIncompleteMembersAction.java (modified) (1 diff)
• data/osm/NoteData.java (modified) (1 diff)
• data/osm/Relation.java (modified) (1 diff)
• gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (1 diff)
• gui/dialogs/OsmIdSelectionDialog.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetContentPanel.java (modified) (1 diff)
• gui/layer/LayerPositionStrategy.java (modified) (1 diff)
• gui/mappaint/mapcss/Condition.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (1 diff)
• io/remotecontrol/handler/ImageryHandler.java (modified) (1 diff)
• tools/ExceptionUtil.java (modified) (2 diffs)
• tools/MemoryManager.java (modified) (2 diffs)
• tools/MultiLineFlowLayout.java (modified) (1 diff)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -250 +250 @@
 
         private static boolean isTagged(final Collection<Node> existingNodes) {
-            return existingNodes.stream().anyMatch(selectedNode -> selectedNode.hasKeys());
+            return existingNodes.stream().anyMatch(Node::hasKeys);
         }
 

trunk/src/org/openstreetmap/josm/actions/relation/DownloadSelectedIncompleteMembersAction.java

@@ -59 +59 @@
     public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
         // selected relations with incomplete members
-        this.relations = SubclassFilteredCollection.filter(getRelations(primitives), r -> r.hasIncompleteMembers());
+        this.relations = SubclassFilteredCollection.filter(getRelations(primitives), Relation::hasIncompleteMembers);
         this.incompleteMembers = buildSetOfIncompleteMembers(relations);
         updateEnabledState();

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

@@ -153 +153 @@
             } else {
                 final Note existingNote = noteList.get(newNote);
-                final boolean isDirty = existingNote.getComments().stream().anyMatch(object -> object.isNew());
+                final boolean isDirty = existingNote.getComments().stream().anyMatch(NoteComment::isNew);
                 if (!isDirty) {
                     noteList.put(newNote);

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

@@ -401 +401 @@
 
     public List<OsmPrimitive> getMemberPrimitivesList() {
-        return Utils.transform(getMembers(), (Function<RelationMember, OsmPrimitive>) x -> x.getMember());
+        return Utils.transform(getMembers(), RelationMember::getMember);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -234 +234 @@
                     iterators.add(i.iterator());
                 }
-                while (iterators.stream().allMatch(it -> it.hasNext())) {
+                while (iterators.stream().allMatch(Iterator::hasNext)) {
                     final List<RelationMemberConflictDecision> decisions = new ArrayList<>();
                     final Collection<String> roles = new HashSet<>();

trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java

@@ -206 +206 @@
                     .collect(Collectors.joining(", "));
             tfId.tryToPasteFrom(parsedText);
-            final Set<OsmPrimitiveType> types = ids.stream().map(x -> x.getType()).collect(Collectors.toSet());
+            final Set<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(Collectors.toSet());
             if (types.size() == 1) {
                 // select corresponding type

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

@@ -300 +300 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            final List<PrimitiveId> primitiveIds = model.getSelectedPrimitives().stream().map(x -> x.getPrimitiveId())
+            final List<PrimitiveId> primitiveIds = model.getSelectedPrimitives().stream().map(HistoryOsmPrimitive::getPrimitiveId)
                     .collect(Collectors.toList());
             Main.worker.submit(new DownloadPrimitivesWithReferrersTask(false, primitiveIds, true, true, null, null));

trunk/src/org/openstreetmap/josm/gui/layer/LayerPositionStrategy.java

@@ -37 +37 @@
      */
     LayerPositionStrategy BEFORE_FIRST_BACKGROUND_LAYER = inFrontOfFirst(
-            layer -> layer.isBackgroundLayer());
+            Layer::isBackgroundLayer);
 
     /**

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

@@ -166 +166 @@
         ONE_OF((test, prototype) -> Arrays.asList(test.split("\\s*;\\s*")).contains(prototype)),
         /** The value needs to begin with the reference string. */
-        BEGINS_WITH((test, prototype) -> test.startsWith(prototype)),
+        BEGINS_WITH(String::startsWith),
         /** The value needs to end with the reference string. */
-        ENDS_WITH((test, prototype) -> test.endsWith(prototype)),
+        ENDS_WITH(String::endsWith),
         /** The value needs to contain the reference string. */
-        CONTAINS((test, prototype) -> test.contains(prototype));
+        CONTAINS(String::contains);
 
         static final Set<Op> NEGATED_OPS = EnumSet.of(NEQ, NREGEX);

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -234 +234 @@
 
             formats = getChildrenStream(child, "Format")
-                    .map(x -> x.getTextContent())
+                    .map(Node::getTextContent)
                     .filter(WMSImagery::isImageFormatSupportedWarn)
                     .collect(Collectors.toList());

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

@@ -132 +132 @@
     public String[] getUsageExamples() {
         final String types = Utils.join("|", Utils.transform(Arrays.asList(ImageryInfo.ImageryType.values()),
-                (Function<ImageryType, String>) x -> x.getTypeString()));
+                ImageryType::getTypeString));
         return new String[] {
             "/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",

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;
     }