Changeset 11970 in josm

Timestamp:

2017-04-22T01:54:36+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1871 - Two branches in the same conditional structure should not have exactly the same implementation

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java (modified) (1 diff)

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

@@ -139 +139 @@
         StyleElementList sl = styles.get(osm, circum, nc);
         for (StyleElement s : sl) {
-            if (drawMultipolygon && drawArea && (s instanceof AreaElement || s instanceof AreaIconElement)
-                    && (flags & StyledMapRenderer.FLAG_DISABLED) == 0) {
-                output.add(new StyleRecord(s, osm, flags));
-            } else if ((drawMultipolygon && drawArea && s instanceof TextElement) || (drawRestriction && s instanceof NodeElement)) {
+            if (drawAreaElement(flags, s) ||
+               (drawMultipolygon && drawArea && s instanceof TextElement) ||
+               (drawRestriction && s instanceof NodeElement)) {
                 output.add(new StyleRecord(s, osm, flags));
             }
         }
+    }
+
+    private boolean drawAreaElement(int flags, StyleElement s) {
+        return drawMultipolygon && drawArea && (s instanceof AreaElement || s instanceof AreaIconElement)
+                && (flags & StyledMapRenderer.FLAG_DISABLED) == 0;
     }