Changeset 8900 in josm for trunk

Timestamp:

2015-10-18T23:16:54+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11986, fix #11987, fix #11988: Patches by michael2402:

• MapStatus: Use a BlockingQueue for cleaner waiting
• Comment in AutoScaleAction#zoomTo is wrong
• Documentation for AutoScaleAction

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (5 diffs)
• gui/MapStatus.java (modified) (8 diffs)

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

@@ -43 +43 @@
 public class AutoScaleAction extends JosmAction {
 
+    /**
+     * A list of things we can zoom to. The zoom target is given depending on the mode.
+     */
     public static final Collection<String> MODES = Collections.unmodifiableList(Arrays.asList(
         marktr(/* ICON(dialogs/autoscale/) */ "data"),
@@ -53 +56 @@
         marktr(/* ICON(dialogs/autoscale/) */ "next")));
 
+    /**
+     * One of {@link #MODES}. Defines what we are zooming to.
+     */
     private final String mode;
 
@@ -83 +89 @@
     }
 
+    /**
+     * Zooms the view to display the given set of primitives.
+     * @param sel The primitives to zoom to, e.g. the current selection.
+     */
     public static void zoomTo(Collection<OsmPrimitive> sel) {
         BoundingXYVisitor bboxCalculator = new BoundingXYVisitor();
         bboxCalculator.computeBoundingBox(sel);
-        // increase bbox by 0.001 degrees on each side. this is required
+        // increase bbox. This is required
         // especially if the bbox contains one single node, but helpful
         // in most other cases as well.
@@ -95 +105 @@
     }
 
+    /**
+     * Performs the auto scale operation of the given mode without the need to create a new action.
+     * @param mode One of {@link #MODES}.
+     */
     public static void autoScale(String mode) {
         new AutoScaleAction(mode, false).autoScale();
@@ -172 +186 @@
     }
 
+    /**
+     * Performs this auto scale operation for the mode this action is in.
+     */
     public void autoScale() {
         if (Main.isDisplayingMapView()) {

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

@@ -33 +33 @@
 import java.util.List;
 import java.util.TreeSet;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.swing.AbstractAction;
@@ -348 +350 @@
         private MapFrame parent;
 
+        private BlockingQueue<MouseState> incommingMouseState = new LinkedBlockingQueue<>();
+
+        private Point lastMousePos;
+
         Collector(MapFrame parent) {
             this.parent = parent;
@@ -360 +366 @@
             try {
                 for (;;) {
-
-                    final MouseState ms = new MouseState();
-                    synchronized (this) {
-                        // TODO Would be better if the timeout wasn't necessary
-                        try {
-                            wait(1000);
-                        } catch (InterruptedException e) {
-                            // Occurs frequently during JOSM shutdown, log set to trace only
-                            Main.trace("InterruptedException in "+MapStatus.class.getSimpleName());
+                    try {
+                        final MouseState ms = incommingMouseState.take();
+                        if (parent != Main.map)
+                            return; // exit, if new parent.
+
+                        // Do nothing, if required data is missing
+                        if (ms.mousePos == null || mv.center == null) {
+                            continue;
                         }
-                        ms.modifiers = mouseState.modifiers;
-                        ms.mousePos = mouseState.mousePos;
-                    }
-                    if (parent != Main.map)
-                        return; // exit, if new parent.
-
-                    // Do nothing, if required data is missing
-                    if (ms.mousePos == null || mv.center == null) {
-                        continue;
-                    }
-
-                    try {
+
                         EventQueue.invokeAndWait(new CollectorWorker(ms));
                     } catch (InterruptedException e) {
@@ -650 +644 @@
             return l;
         }
+
+        /**
+         * Called whenever the mouse position or modifiers changed.
+         * @param mousePos The new mouse position. <code>null</code> if it did not change.
+         * @param modifiers The new modifiers.
+         */
+        public synchronized void updateMousePosition(Point mousePos, int modifiers) {
+            MouseState ms = new MouseState();
+            if (mousePos == null) {
+                ms.mousePos = lastMousePos;
+            } else {
+                lastMousePos = mousePos;
+            }
+            // remove mouse states that are in the queue. Our mouse state is newer.
+            incommingMouseState.clear();
+            incommingMouseState.offer(ms);
+        }
     }
 
@@ -660 +671 @@
         private int modifiers;
     }
-    /**
-     * The last sent mouse movement event.
-     */
-    private transient MouseState mouseState = new MouseState();
 
     private transient AWTEventListener awtListener = new AWTEventListener() {
@@ -671 +678 @@
                     ((InputEvent) event).getComponent() == mv) {
                 synchronized (collector) {
-                    mouseState.modifiers = ((InputEvent) event).getModifiersEx();
+                    int modifiers = ((InputEvent) event).getModifiersEx();
+                    Point mousePos = null;
                     if (event instanceof MouseEvent) {
-                        mouseState.mousePos = ((MouseEvent) event).getPoint();
+                        mousePos = ((MouseEvent) event).getPoint();
                     }
-                    collector.notifyAll();
+                    collector.updateMousePosition(mousePos, modifiers);
                 }
             }
@@ -685 +693 @@
         public void mouseMoved(MouseEvent e) {
             synchronized (collector) {
-                mouseState.modifiers = e.getModifiersEx();
-                mouseState.mousePos = e.getPoint();
-                collector.notifyAll();
+                collector.updateMousePosition(e.getPoint(), e.getModifiersEx());
             }
         }
@@ -700 +706 @@
         @Override public void keyPressed(KeyEvent e) {
             synchronized (collector) {
-                mouseState.modifiers = e.getModifiersEx();
-                collector.notifyAll();
+                collector.updateMousePosition(null, e.getModifiersEx());
             }
         }