Ticket #6858: patch.diff

src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java

@@ -9 +9 @@
 import java.awt.Stroke;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
-import org.openstreetmap.josm.data.Bounds;
 
 /**
  * @author Vincent
@@ -22 +21 @@
     private Color color;
     private Stroke stroke;
 
-    public MapRectangleImpl(Bounds bounds) {
-        this(bounds, Color.BLUE, new BasicStroke(2));
+    public MapRectangleImpl(Coordinate topLeft, Coordinate bottomRight) {
+        this(topLeft, bottomRight, Color.BLUE, new BasicStroke(2));
     }
 
-    public MapRectangleImpl(Bounds bounds, Color color, Stroke stroke) {
-        this.topLeft = new Coordinate(bounds.getMax().lat(), bounds.getMin().lon());
-        this.bottomRight = new Coordinate(bounds.getMin().lat(), bounds.getMax().lon());
+    public MapRectangleImpl(Coordinate topLeft, Coordinate bottomRight, Color color, Stroke stroke) {
+        this.topLeft = topLeft;
+        this.bottomRight = bottomRight;
         this.color = color;
         this.stroke = stroke;
     }

src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -56 +55 @@
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumnModel;
 
+import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.MapPolygonImpl;
 import org.openstreetmap.gui.jmapviewer.MapRectangleImpl;
@@ -64 +64 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
-import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.imagery.Shape;
@@ -578 +577 @@
                         if (listdef.getSelectionModel().isSelectedIndex(i)) {
                             if (!mapRectangles.containsKey(i)) {
                                 // Add new map rectangle
-                                MapRectangle rectangle = new MapRectangleImpl(bounds);
+                                Coordinate topLeft = new Coordinate(bounds.getMax().lat(), bounds.getMin().lon());
+                                Coordinate bottomRight = new Coordinate(bounds.getMin().lat(), bounds.getMax().lon());
+                                MapRectangle rectangle = new MapRectangleImpl(topLeft, bottomRight);
                                 mapRectangles.put(i, rectangle);
                                 map.addMapRectangle(rectangle);
                             }