Context Navigation

Changeset 16438 in josm for trunk/test

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

Location:

trunk/test

Files:

-              r9546
+              r16438
 import java.awt.BorderLayout;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import javax.swing.JFrame;
 …
             n1.put("key" + i, "value" + i);
+        }
+        StringBuilder note = new StringBuilder();
+        for (int i = 0; i < 50; i++) {
+            note.append(" A very long text ");
+        }
+        n1.put("note", note.toString());
+        // Java 11: use String.repeat
+        String note = IntStream.range(0, 50).mapToObj(i -> " A very long text ").collect(Collectors.joining());
+        n1.put("note", note);
         w1.addNode(new Node(2));
         w1.addNode(new Node(3));

-              r15576
+              r16438
     private static double getOriginalLength(Collection<Way> ways) {
+        double len = 0;
+        for (Way w : ways) {
+            len += w.getLength();
+        }
+        return len;
+        return ways.stream().mapToDouble(Way::getLength).sum();
+    }

-              r16371
+              r16438
         Set<RelationMember> matchCandidates = new HashSet<>(r2.getMembers());
         for (RelationMember rm : r1.getMembers()) {
+            RelationMember matched = null;
+            for (RelationMember cand : matchCandidates) {
+                if (!rm.getRole().equals(cand.getRole())) continue;
+                if (!isSemanticallyEqual(rm.getMember(), cand.getMember())) continue;
+                matched = cand;
+                break;
+            }
+            RelationMember matched = matchCandidates.stream()
+                    .filter(m -> rm.getRole().equals(m.getRole()))
+                    .filter(m -> isSemanticallyEqual(rm.getMember(), m.getMember()))
+                    .findFirst().orElse(null);
             if (matched == null) return false;
             matchCandidates.remove(matched);

-              r12746
+              r16438
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 …
      * Tests {@link ICoordinateFormat#latToString(org.openstreetmap.josm.data.coor.ILatLon)}
      * and {@link ICoordinateFormat#lonToString(org.openstreetmap.josm.data.coor.ILatLon)}
+     * and {@link ICoordinateFormat#toString(ILatLon, String)}
      * for various implementations.
      */
 …
         assertEquals("47.0", DecimalDegreesCoordinateFormat.INSTANCE.latToString(c));
         assertEquals("19.0", DecimalDegreesCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("47.0 19.0", DecimalDegreesCoordinateFormat.INSTANCE.toString(c, " "));
         assertEquals("47°00'00.0\"N", DMSCoordinateFormat.INSTANCE.latToString(c));
         assertEquals("19°00'00.0\"E", DMSCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("47°00'00.0\"N  19°00'00.0\"E", DMSCoordinateFormat.INSTANCE.toString(c, "  "));
         assertEquals("47°00.000'N", NauticalCoordinateFormat.INSTANCE.latToString(c));
         assertEquals("19°00.000'E", NauticalCoordinateFormat.INSTANCE.lonToString(c));

-              r16006
+              r16438
     private Relation getRelation(String testType) {
+        for (Relation r: testDataset.getRelations()) {
+            if (testType.equals(r.get("test")))
+                return r;
+        }
+        return null;
+        return testDataset.getRelations().stream().filter(r -> testType.equals(r.get("test"))).findFirst().orElse(null);
+    }
     private String[] getNames(List<RelationMember> members) {
+        String[] result = new String[members.size()];
+        for (int i = 0; i < result.length; i++) {
+            result[i] = members.get(i).getMember().get("name");
+        }
+        return result;
+        return members.stream().map(member -> member.getMember().get("name")).toArray(String[]::new);
+    }

-              r16006
+              r16438
     private Relation getRelation(String testType) {
+        for (Relation r: testDataset.getRelations()) {
+            if (testType.equals(r.get("test")))
+                return r;
+        }
+        return null;
+        return testDataset.getRelations().stream().filter(r -> testType.equals(r.get("test"))).findFirst().orElse(null);
+    }

-              r16398
+              r16438
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.imageio.ImageIO;
 …
         // |  8  3  7  |
         // +-----------+
         for (LatLon candidate : new LatLon[] {
+        return Stream.of(
                 new LatLon(y1, x2),
                 new LatLon(y2, x3),
 …
                 new LatLon(y3, x3),
                 new LatLon(y3, x1)
+        }) {
+            if (shape.contains(candidate)) {
+                return candidate;
+            }
+        }
+        return center;
+        ).filter(shape::contains).findFirst().orElse(center);
+    }

Note: See TracChangeset for help on using the changeset viewer.