Changeset 9779 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

add more unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/markerlayer (added)
• test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarkerTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarkerTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/markerlayer/WebMarkerTest.java (added)

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

@@ -4 +4 @@
 import java.awt.BorderLayout;
 import java.awt.Cursor;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
@@ -68 +69 @@
         scale.setSelected(true);
         JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE);
-        JDialog dlg = pane.createDialog(Main.parent, imageUrl.toString());
-        dlg.setModal(false);
-        dlg.toFront();
-        dlg.setVisible(true);
+        if (!GraphicsEnvironment.isHeadless()) {
+            JDialog dlg = pane.createDialog(Main.parent, imageUrl.toString());
+            dlg.setModal(false);
+            dlg.toFront();
+            dlg.setVisible(true);
+        }
     }
 

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);
+                    }
+                }
+            });
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.GraphicsEnvironment;
 import java.io.IOException;
 import java.net.URL;
@@ -377 +378 @@
         else
             msg = tr(msg);
-        JOptionPane.showMessageDialog(Main.parent,
-                "<html><p>" + msg + "</p></html>",
-                tr("Error playing sound"), JOptionPane.ERROR_MESSAGE);
+        Main.error(msg);
+        if (!GraphicsEnvironment.isHeadless()) {
+            JOptionPane.showMessageDialog(Main.parent,
+                    "<html><p>" + msg + "</p></html>",
+                    tr("Error playing sound"), JOptionPane.ERROR_MESSAGE);
+        }
     }
 }