Changeset 5500 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2012-09-04T00:13:37+02:00 (14 years ago)

Author:

Don-vip

Message:

Improves selection graphical performance by replacing the external calls to Component.getGraphics() with proper Swing paint mechanism

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 
+import java.awt.Color;
 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;
@@ -108 +111 @@
     protected EastNorth center = calculateDefaultCenter();
 
+    private static final Object paintRequestLock = new Object();
+    private Rectangle paintRect = null;
+    private Polygon paintPoly = null;
+    
     public NavigatableComponent() {
         setLayout(null);
@@ -1266 +1273 @@
         Cursors = c;
     }
+    
+    @Override
+    public void paint(Graphics g) {
+        synchronized (paintRequestLock) {
+            if (paintRect != null) {
+                Graphics g2 = g.create();
+                g2.setColor(Color.BLACK);
+                g2.setXORMode(Color.WHITE);
+                g2.drawRect(paintRect.x, paintRect.y, paintRect.width, paintRect.height);
+            }
+            if (paintPoly != null) {
+                Graphics g2 = g.create();
+                g2.setColor(Color.WHITE);
+                g2.drawPolyline(paintPoly.xpoints, paintPoly.ypoints, paintPoly.npoints);
+            }
+        }
+        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();
+    }
 }