Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Diff.java (modified) (2 diffs)
• ImageProvider.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -597 +597 @@
         public String toString() {
             String s = String.format("%d -%d +%d %d", line0, deleted, inserted, line1);
-            return (link != null) ? s = s + '\n' + link : s;
+            return (link != null) ? s + '\n' + link : s;
         }
     }
@@ -832 +832 @@
                 Integer ir = h.get(data[i]);
                 if (ir == null) {
-                    h.put(data[i], equivs[i] = equivMax++);
+                    equivs[i] = equivMax++;
+                    h.put(data[i], equivs[i]);
                 } else {
                     equivs[i] = ir.intValue();

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -58 +58 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -83 +84 @@
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGUniverse;
-import org.openstreetmap.josm.data.osm.DataSet;
 
 /**
@@ -1229 +1229 @@
             Map<Long, ImageResource> cacheByAngle = ROTATE_CACHE.get(img);
             if (cacheByAngle == null) {
-                ROTATE_CACHE.put(img, cacheByAngle = new HashMap<>());
+                cacheByAngle = new HashMap<>();
+                ROTATE_CACHE.put(img, cacheByAngle);
             }
 
@@ -1257 +1258 @@
                 }
                 Image image = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-                cacheByAngle.put(originalAngle, imageResource = new ImageResource(image));
+                imageResource = new ImageResource(image);
+                cacheByAngle.put(originalAngle, imageResource);
                 Graphics g = image.getGraphics();
                 Graphics2D g2d = (Graphics2D) g.create();