Changeset 15963 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

Timestamp:

2020-02-29T16:02:30+01:00 (5 years ago)

Author:

Don-vip

Message:

see #17516 - update to error-prone 2.3.5-SNAPSHOT plus following patches for Java 13 compatibility (​https://github.com/don-vip/error-prone/commits/jdk13):

• ​https://github.com/google/error-prone/pull/1107
• ​https://github.com/google/error-prone/pull/1110
• ​https://github.com/google/error-prone/pull/1111
• ​https://github.com/google/error-prone/pull/1398
• ​https://github.com/google/error-prone/pull/1439

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -12 +12 @@
 import java.awt.GridBagLayout;
 import java.awt.Image;
-import java.awt.Point;
 import java.awt.Shape;
 import java.awt.Toolkit;
@@ -994 +993 @@
     private void drawImageInside(Graphics2D g, BufferedImage toDrawImg, TileAnchor anchorImage, TileAnchor anchorScreen, Shape clip) {
         AffineTransform imageToScreen = anchorImage.convert(anchorScreen);
-        Point2D screen0 = imageToScreen.transform(new Point.Double(0, 0), null);
-        Point2D screen1 = imageToScreen.transform(new Point.Double(
+        Point2D screen0 = imageToScreen.transform(new Point2D.Double(0, 0), null);
+        Point2D screen1 = imageToScreen.transform(new Point2D.Double(
                 toDrawImg.getWidth(), toDrawImg.getHeight()), null);
 
@@ -1113 +1112 @@
             return ((ReprojectionTile) tile).getAnchor();
         } else if (image != null) {
-            return new TileAnchor(new Point.Double(0, 0), new Point.Double(image.getWidth(), image.getHeight()));
+            return new TileAnchor(new Point2D.Double(0, 0), new Point2D.Double(image.getWidth(), image.getHeight()));
         } else {
             return null;