Changeset 15963 in josm for trunk/src/org

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (2 diffs)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (5 diffs)
• gui/layer/AbstractTileSourceLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -444 +445 @@
      * Adapter for zoom change events
      */
-    private class ZoomChangeAdapter implements MapView.ZoomChangeListener {
+    private class ZoomChangeAdapter implements ZoomChangeListener {
         @Override
         public void zoomChanged() {

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
@@ -43 +48 @@
  * This panel displays a map and lets the user chose a {@link BBox}.
  */
-public class SlippyMapBBoxChooser extends JosmMapViewer implements BBoxChooser, ChangeListener,
-    MainLayerManager.ActiveLayerChangeListener, MainLayerManager.LayerChangeListener {
+public class SlippyMapBBoxChooser extends JosmMapViewer implements BBoxChooser, ChangeListener, ActiveLayerChangeListener, LayerChangeListener {
 
     /**
@@ -335 +339 @@
 
     @Override
-    public void layerAdded(MainLayerManager.LayerAddEvent e) {
+    public void layerAdded(LayerAddEvent e) {
         if (e.getAddedLayer() instanceof ImageryLayer) {
             this.refreshTileSources();
@@ -342 +346 @@
 
     @Override
-    public void layerRemoving(MainLayerManager.LayerRemoveEvent e) {
+    public void layerRemoving(LayerRemoveEvent e) {
         if (e.getRemovedLayer() instanceof ImageryLayer) {
             this.refreshTileSources();
@@ -349 +353 @@
 
     @Override
-    public void layerOrderChanged(MainLayerManager.LayerOrderChangeEvent e) {
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
         // Do nothing
     }

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;