Changeset 8907 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-10-19T16:19:21+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11989 - middle click function broken (patch by michael2402)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (4 diffs)
• dialogs/relation/MemberTableMemberCellRenderer.java (modified) (1 diff)

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

@@ -350 +350 @@
         private MapFrame parent;
 
-        private BlockingQueue<MouseState> incommingMouseState = new LinkedBlockingQueue<>();
+        private final BlockingQueue<MouseState> incomingMouseState = new LinkedBlockingQueue<>();
 
         private Point lastMousePos;
@@ -367 +367 @@
                 for (;;) {
                     try {
-                        final MouseState ms = incommingMouseState.take();
+                        final MouseState ms = incomingMouseState.take();
                         if (parent != Main.map)
                             return; // exit, if new parent.
@@ -651 +651 @@
          */
         public synchronized void updateMousePosition(Point mousePos, int modifiers) {
-            MouseState ms = new MouseState();
-            if (mousePos == null) {
-                ms.mousePos = lastMousePos;
-            } else {
+            if (mousePos != null) {
                 lastMousePos = mousePos;
             }
+            MouseState ms = new MouseState(lastMousePos, modifiers);
             // remove mouse states that are in the queue. Our mouse state is newer.
-            incommingMouseState.clear();
-            incommingMouseState.offer(ms);
+            incomingMouseState.clear();
+            incomingMouseState.offer(ms);
         }
     }
@@ -667 +665 @@
      * @author imi
      */
-    static class MouseState {
-        private Point mousePos;
-        private int modifiers;
+    private static class MouseState {
+        private final Point mousePos;
+        private final int modifiers;
+
+        MouseState(Point mousePos, int modifiers) {
+            this.mousePos = mousePos;
+            this.modifiers = modifiers;
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java

@@ -16 +16 @@
 public class MemberTableMemberCellRenderer extends MemberTableCellRenderer {
 
-        /**
-         * Constructs a new {@code MemberTableMemberCellRenderer}.
-         */
+    /**
+     * Constructs a new {@code MemberTableMemberCellRenderer}.
+     */
     public MemberTableMemberCellRenderer() {
         super();