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

Timestamp:

2017-04-27T19:59:48+02:00 (8 years ago)

Author:

michael2402

Message:

See #13883: Use parallel sort for style elems

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -27 +27 @@
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -1523 +1523 @@
             }
 
-            Collections.sort(allStyleElems); // TODO: try parallel sort when switching to Java 8
+            // We use parallel sort here. This is only available for arrays.
+            StyleRecord[] sorted = allStyleElems.toArray(new StyleRecord[allStyleElems.size()]);
+            Arrays.parallelSort(sorted, null);
 
             if (!benchmark.renderDraw(allStyleElems)) {
@@ -1529 +1531 @@
             }
 
-            for (StyleRecord record : allStyleElems) {
+            for (StyleRecord record : sorted) {
                 paintRecord(record);
             }