Changeset 11914 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2017-04-15T02:00:43+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2972 - Inner classes should not have too many lines of code

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• ComputeStyleListWorker.java (added)
• StyledMapRenderer.java (modified) (7 diffs)

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

@@ -35 +35 @@
 import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.RecursiveTask;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -48 +46 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -57 +54 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
@@ -69 +65 @@
 import org.openstreetmap.josm.gui.draw.MapViewPath;
 import org.openstreetmap.josm.gui.draw.MapViewPositionAndRotation;
-import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.StyleElementList;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
-import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
-import org.openstreetmap.josm.gui.mappaint.styleelement.AreaIconElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.HorizontalTextAlignment;
@@ -83 +73 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.Symbol;
-import org.openstreetmap.josm.gui.mappaint.styleelement.TextElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
 import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
@@ -247 +236 @@
      * Not used in any public interfaces.
      */
-    private static final int FLAG_NORMAL = 0;
+    static final int FLAG_NORMAL = 0;
     /**
      * A primitive with {@link OsmPrimitive#isDisabled()}
      */
-    private static final int FLAG_DISABLED = 1;
+    static final int FLAG_DISABLED = 1;
     /**
      * A primitive with {@link OsmPrimitive#isMemberOfSelected()}
      */
-    private static final int FLAG_MEMBER_OF_SELECTED = 2;
+    static final int FLAG_MEMBER_OF_SELECTED = 2;
     /**
      * A primitive with {@link OsmPrimitive#isSelected()}
      */
-    private static final int FLAG_SELECTED = 4;
+    static final int FLAG_SELECTED = 4;
     /**
      * A primitive with {@link OsmPrimitive#isOuterMemberOfSelected()}
      */
-    private static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
+    static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
 
     private static final double PHI = Math.toRadians(20);
@@ -1495 +1484 @@
     }
 
-    private static class ComputeStyleListWorker extends RecursiveTask<List<StyleRecord>> implements Visitor {
-        private final transient List<? extends OsmPrimitive> input;
-        private final transient List<StyleRecord> output;
-
-        private final transient ElemStyles styles = MapPaintStyles.getStyles();
-        private final int directExecutionTaskSize;
-        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(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);
-        }
-
-        @Override
-        protected List<StyleRecord> compute() {
-            if (input.size() <= directExecutionTaskSize) {
-                return computeDirectly();
-            } else {
-                final Collection<ForkJoinTask<List<StyleRecord>>> tasks = new ArrayList<>();
-                for (int fromIndex = 0; fromIndex < input.size(); fromIndex += directExecutionTaskSize) {
-                    final int toIndex = Math.min(fromIndex + directExecutionTaskSize, input.size());
-                    final List<StyleRecord> output = new ArrayList<>(directExecutionTaskSize);
-                    tasks.add(new ComputeStyleListWorker(circum, nc, input.subList(fromIndex, toIndex), output, directExecutionTaskSize).fork());
-                }
-                for (ForkJoinTask<List<StyleRecord>> task : tasks) {
-                    output.addAll(task.join());
-                }
-                return output;
-            }
-        }
-
-        public List<StyleRecord> computeDirectly() {
-            MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
-            try {
-                for (final OsmPrimitive osm : input) {
-                    acceptDrawable(osm);
-                }
-                return output;
-            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
-                throw BugReport.intercept(e).put("input-size", input.size()).put("output-size", output.size());
-            } finally {
-                MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();
-            }
-        }
-
-        private void acceptDrawable(final OsmPrimitive osm) {
-            try {
-                if (osm.isDrawable()) {
-                    osm.accept(this);
-                }
-            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
-                throw BugReport.intercept(e).put("osm", osm);
-            }
-        }
-
-        @Override
-        public void visit(Node n) {
-            add(n, computeFlags(n, false));
-        }
-
-        @Override
-        public void visit(Way w) {
-            add(w, computeFlags(w, true));
-        }
-
-        @Override
-        public void visit(Relation r) {
-            add(r, computeFlags(r, true));
-        }
-
-        @Override
-        public void visit(Changeset cs) {
-            throw new UnsupportedOperationException();
-        }
-
-        public void add(Node osm, int flags) {
-            StyleElementList sl = styles.get(osm, circum, nc);
-            for (StyleElement s : sl) {
-                output.add(new StyleRecord(s, osm, flags));
-            }
-        }
-
-        public void add(Relation osm, int flags) {
-            StyleElementList sl = styles.get(osm, circum, nc);
-            for (StyleElement s : sl) {
-                if (drawMultipolygon && drawArea && (s instanceof AreaElement || s instanceof AreaIconElement) && (flags & FLAG_DISABLED) == 0) {
-                    output.add(new StyleRecord(s, osm, flags));
-                } else if (drawMultipolygon && drawArea && s instanceof TextElement) {
-                    output.add(new StyleRecord(s, osm, flags));
-                } else if (drawRestriction && s instanceof NodeElement) {
-                    output.add(new StyleRecord(s, osm, flags));
-                }
-            }
-        }
-
-        public void add(Way osm, int flags) {
-            StyleElementList sl = styles.get(osm, circum, nc);
-            for (StyleElement s : sl) {
-                if ((drawArea && (flags & FLAG_DISABLED) == 0) || !(s instanceof AreaElement)) {
-                    output.add(new StyleRecord(s, osm, flags));
-                }
-            }
-        }
-    }
-
     /**
      * Sets the factory that creates the benchmark data receivers.