diff --git a/build.xml b/build.xml
index ffe609724..856511bae 100644
--- a/build.xml
+++ b/build.xml
@@ -42,6 +42,7 @@
+
@@ -101,6 +102,7 @@
+
@@ -356,7 +358,7 @@ Build-Date: ${build.tstamp}
-
+
@@ -382,7 +384,7 @@ Build-Date: ${build.tstamp}
-
+
diff --git a/src/org/openstreetmap/josm/actions/AutoScaleAction.java b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
index ac1a0ab07..989554605 100644
--- a/src/org/openstreetmap/josm/actions/AutoScaleAction.java
+++ b/src/org/openstreetmap/josm/actions/AutoScaleAction.java
@@ -32,6 +32,7 @@
import org.openstreetmap.josm.gui.MapFrame;
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;
import org.openstreetmap.josm.gui.dialogs.ValidatorDialog.ValidatorBoundingXYVisitor;
@@ -443,7 +444,7 @@ protected final void installAdapters() {
/**
* Adapter for zoom change events
*/
- private class ZoomChangeAdapter implements MapView.ZoomChangeListener {
+ private class ZoomChangeAdapter implements ZoomChangeListener {
@Override
public void zoomChanged() {
updateEnabledState();
diff --git a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
index 270073b87..3272ff879 100644
--- a/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
@@ -35,15 +35,19 @@
import org.openstreetmap.josm.data.preferences.StringProperty;
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;
/**
* 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 {
/**
* Plugins that wish to add custom tile sources to slippy map choose should call this method
@@ -334,21 +338,21 @@ public final void refreshTileSources() {
}
@Override
- public void layerAdded(MainLayerManager.LayerAddEvent e) {
+ public void layerAdded(LayerAddEvent e) {
if (e.getAddedLayer() instanceof ImageryLayer) {
this.refreshTileSources();
}
}
@Override
- public void layerRemoving(MainLayerManager.LayerRemoveEvent e) {
+ public void layerRemoving(LayerRemoveEvent e) {
if (e.getRemovedLayer() instanceof ImageryLayer) {
this.refreshTileSources();
}
}
@Override
- public void layerOrderChanged(MainLayerManager.LayerOrderChangeEvent e) {
+ public void layerOrderChanged(LayerOrderChangeEvent e) {
// Do nothing
}
}
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index 45c6f2eca..c6f9b9590 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -11,7 +11,6 @@
import java.awt.Graphics2D;
import java.awt.GridBagLayout;
import java.awt.Image;
-import java.awt.Point;
import java.awt.Shape;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
@@ -993,8 +992,8 @@ private BufferedImage getLoadedTileImage(Tile tile) {
*/
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);
Shape oldClip = null;
@@ -1112,7 +1111,7 @@ private static TileAnchor getAnchor(Tile tile, BufferedImage image) {
if (tile instanceof ReprojectionTile) {
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;
}
diff --git a/tools/auto-value-annotations.jar b/tools/auto-value-annotations.jar
new file mode 100644
index 000000000..1828798c4
Binary files /dev/null and b/tools/auto-value-annotations.jar differ
diff --git a/tools/error_prone_core.jar b/tools/error_prone_core.jar
index d4dbe51d0..971b3ac9c 100644
Binary files a/tools/error_prone_core.jar and b/tools/error_prone_core.jar differ