Ticket #12933: patch-mapview-remove-paint-poly.patch

src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
 import java.awt.Cursor;
-import java.awt.Graphics;
 import java.awt.Point;
-import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
@@ -43 +41 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -142 +139 @@
      */
     protected EastNorth center = calculateDefaultCenter();
 
-    private final transient Object paintRequestLock = new Object();
-    private Rectangle paintRect;
-    private Polygon paintPoly;
-
     protected transient ViewportData initialViewport;
 
     protected final transient CursorManager cursorManager = new CursorManager(this);
@@ -1571 +1564 @@
         return cursorManager;
     }
 
-    @Override
-    public void paint(Graphics g) {
-        synchronized (paintRequestLock) {
-            if (paintRect != null) {
-                Graphics g2 = g.create();
-                g2.setColor(Utils.complement(PaintColors.getBackgroundColor()));
-                g2.drawRect(paintRect.x, paintRect.y, paintRect.width, paintRect.height);
-                g2.dispose();
-            }
-            if (paintPoly != null) {
-                Graphics g2 = g.create();
-                g2.setColor(Utils.complement(PaintColors.getBackgroundColor()));
-                g2.drawPolyline(paintPoly.xpoints, paintPoly.ypoints, paintPoly.npoints);
-                g2.dispose();
-            }
-        }
-        super.paint(g);
-    }
-
-    /**
-     * Requests to paint the given {@code Rectangle}.
-     * @param r The Rectangle to draw
-     * @see #requestClearRect
-     * @since 5500
-     */
-    public void requestPaintRect(Rectangle r) {
-        if (r != null) {
-            synchronized (paintRequestLock) {
-                paintRect = r;
-            }
-            repaint();
-        }
-    }
-
-    /**
-     * Requests to paint the given {@code Polygon} as a polyline (unclosed polygon).
-     * @param p The Polygon to draw
-     * @see #requestClearPoly
-     * @since 5500
-     */
-    public void requestPaintPoly(Polygon p) {
-        if (p != null) {
-            synchronized (paintRequestLock) {
-                paintPoly = p;
-            }
-            repaint();
-        }
-    }
-
-    /**
-     * Requests to clear the rectangled previously drawn.
-     * @see #requestPaintRect
-     * @since 5500
-     */
-    public void requestClearRect() {
-        synchronized (paintRequestLock) {
-            paintRect = null;
-        }
-        repaint();
-    }
-
-    /**
-     * Requests to clear the polyline previously drawn.
-     * @see #requestPaintPoly
-     * @since 5500
-     */
-    public void requestClearPoly() {
-        synchronized (paintRequestLock) {
-            paintPoly = null;
-        }
-        repaint();
-    }
-
     /**
      * Get a max scale for projection that describes world in 1/512 of the projection unit
      * @return max scale