Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2016-05-11T02:44:10+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/Diff.java
r10001 r10179 597 597 public String toString() { 598 598 String s = String.format("%d -%d +%d %d", line0, deleted, inserted, line1); 599 return (link != null) ? s = s+ '\n' + link : s;599 return (link != null) ? s + '\n' + link : s; 600 600 } 601 601 } … … 832 832 Integer ir = h.get(data[i]); 833 833 if (ir == null) { 834 h.put(data[i], equivs[i] = equivMax++); 834 equivs[i] = equivMax++; 835 h.put(data[i], equivs[i]); 835 836 } else { 836 837 equivs[i] = ir.intValue(); -
trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
r10140 r10179 58 58 59 59 import org.openstreetmap.josm.Main; 60 import org.openstreetmap.josm.data.osm.DataSet; 60 61 import org.openstreetmap.josm.data.osm.OsmPrimitive; 61 62 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; … … 83 84 import com.kitfox.svg.SVGDiagram; 84 85 import com.kitfox.svg.SVGUniverse; 85 import org.openstreetmap.josm.data.osm.DataSet;86 86 87 87 /** … … 1229 1229 Map<Long, ImageResource> cacheByAngle = ROTATE_CACHE.get(img); 1230 1230 if (cacheByAngle == null) { 1231 ROTATE_CACHE.put(img, cacheByAngle = new HashMap<>()); 1231 cacheByAngle = new HashMap<>(); 1232 ROTATE_CACHE.put(img, cacheByAngle); 1232 1233 } 1233 1234 … … 1257 1258 } 1258 1259 Image image = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB); 1259 cacheByAngle.put(originalAngle, imageResource = new ImageResource(image)); 1260 imageResource = new ImageResource(image); 1261 cacheByAngle.put(originalAngle, imageResource); 1260 1262 Graphics g = image.getGraphics(); 1261 1263 Graphics2D g2d = (Graphics2D) g.create();
Note:
See TracChangeset
for help on using the changeset viewer.