Changeset 11351 in josm for trunk/src

Timestamp:

2016-11-30T13:19:01+01:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - SE_BAD_FIELD_INNER_CLASS

File:

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

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

@@ -1795 +1795 @@
     }
 
-    private class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor {
+    private static class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor {
         private final transient List<? extends OsmPrimitive> input;
         private final transient List<StyleRecord> output;
@@ -1801 +1801 @@
         private final transient ElemStyles styles = MapPaintStyles.getStyles();
         private final int directExecutionTaskSize;
-
-        private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10_000_000);
-        private final boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
-        private final boolean drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
+        private final double circum;
+        private final NavigatableComponent nc;
+
+        private final boolean drawArea;
+        private final boolean drawMultipolygon;
+        private final boolean drawRestriction;
 
         /**
          * Constructs a new {@code ComputeStyleListWorker}.
+         * @param circum distance on the map in meters that 100 screen pixels represent
+         * @param nc navigatable component
          * @param input the primitives to process
          * @param output the list of styles to which styles will be added
          * @param directExecutionTaskSize the threshold deciding whether to subdivide the tasks
          */
-        ComputeStyleListWorker(final List<? extends OsmPrimitive> input, List<StyleRecord> output, int directExecutionTaskSize) {
+        ComputeStyleListWorker(double circum, NavigatableComponent nc,
+                final List<? extends OsmPrimitive> input, List<StyleRecord> output, int directExecutionTaskSize) {
+            this.circum = circum;
+            this.nc = nc;
             this.input = input;
             this.output = output;
             this.directExecutionTaskSize = directExecutionTaskSize;
+            this.drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10_000_000);
+            this.drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true);
+            this.drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);
             this.styles.setDrawMultipolygon(drawMultipolygon);
         }
@@ -1828 +1838 @@
                     final int toIndex = Math.min(fromIndex + directExecutionTaskSize, input.size());
                     final List<StyleRecord> output = new ArrayList<>(directExecutionTaskSize);
-                    tasks.add(new ComputeStyleListWorker(input.subList(fromIndex, toIndex), output, directExecutionTaskSize).fork());
+                    tasks.add(new ComputeStyleListWorker(circum, nc, input.subList(fromIndex, toIndex), output, directExecutionTaskSize).fork());
                 }
                 for (ForkJoinTask<List<StyleRecord>> task : tasks) {
@@ -1938 +1948 @@
 
             // Need to process all relations first.
-            // Reason: Make sure, ElemStyles.getStyleCacheWithRange is
-            // not called for the same primitive in parallel threads.
-            // (Could be synchronized, but try to avoid this for
-            // performance reasons.)
-            THREAD_POOL.invoke(new ComputeStyleListWorker(relations, allStyleElems,
+            // Reason: Make sure, ElemStyles.getStyleCacheWithRange is not called for the same primitive in parallel threads.
+            // (Could be synchronized, but try to avoid this for performance reasons.)
+            THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, relations, allStyleElems,
                     Math.max(20, relations.size() / THREAD_POOL.getParallelism() / 3)));
-            THREAD_POOL.invoke(new ComputeStyleListWorker(new CompositeList<>(nodes, ways), allStyleElems,
+            THREAD_POOL.invoke(new ComputeStyleListWorker(circum, nc, new CompositeList<>(nodes, ways), allStyleElems,
                     Math.max(100, (nodes.size() + ways.size()) / THREAD_POOL.getParallelism() / 3)));