Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Timestamp:

2016-05-11T02:44:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:AssignmentInSubExpressionCheck - Assignments should not be made from within sub-expressions

File:

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

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

@@ -84 +84 @@
             Map<DataSet, Map<Relation, Multipolygon>> map1 = cache.get(nc);
             if (map1 == null) {
-                cache.put(nc, map1 = new ConcurrentHashMap<>());
+                map1 = new ConcurrentHashMap<>();
+                cache.put(nc, map1);
             }
             Map<Relation, Multipolygon> map2 = map1.get(r.getDataSet());
             if (map2 == null) {
-                map1.put(r.getDataSet(), map2 = new ConcurrentHashMap<>());
+                map2 = new ConcurrentHashMap<>();
+                map1.put(r.getDataSet(), map2);
             }
             multipolygon = map2.get(r);
             if (multipolygon == null || forceRefresh) {
-                map2.put(r, multipolygon = new Multipolygon(r));
+                multipolygon = new Multipolygon(r);
+                map2.put(r, multipolygon);
                 for (PolyData pd : multipolygon.getCombinedPolygons()) {
                     if (pd.selected) {