Changeset 9779 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

Timestamp:

2016-02-10T21:33:50+01:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -54 +54 @@
                 playHead = new PlayHeadMarker();
             } catch (Exception ex) {
+                Main.error(ex);
                 return null;
             }
@@ -67 +68 @@
         if (!enabled) return;
         dropTolerance = Main.pref.getInteger("marker.playHeadDropTolerance", 50);
-        Main.map.mapView.addMouseListener(new MouseAdapter() {
-            @Override public void mousePressed(MouseEvent ev) {
-                Point p = ev.getPoint();
-                if (ev.getButton() != MouseEvent.BUTTON1 || p == null)
-                    return;
-                if (playHead.containsPoint(p)) {
-                    /* when we get a click on the marker, we need to switch mode to avoid
-                     * getting confused with other drag operations (like select) */
-                    oldMode = Main.map.mapMode;
-                    oldCoor = getCoor();
-                    PlayHeadDragMode playHeadDragMode = new PlayHeadDragMode(playHead);
-                    Main.map.selectMapMode(playHeadDragMode);
-                    playHeadDragMode.mousePressed(ev);
-                }
-            }
-        });
+        if (Main.isDisplayingMapView()) {
+            Main.map.mapView.addMouseListener(new MouseAdapter() {
+                @Override public void mousePressed(MouseEvent ev) {
+                    Point p = ev.getPoint();
+                    if (ev.getButton() != MouseEvent.BUTTON1 || p == null)
+                        return;
+                    if (playHead.containsPoint(p)) {
+                        /* when we get a click on the marker, we need to switch mode to avoid
+                         * getting confused with other drag operations (like select) */
+                        oldMode = Main.map.mapMode;
+                        oldCoor = getCoor();
+                        PlayHeadDragMode playHeadDragMode = new PlayHeadDragMode(playHead);
+                        Main.map.selectMapMode(playHeadDragMode);
+                        playHeadDragMode.mousePressed(ev);
+                    }
+                }
+            });
+        }
     }