Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 16960)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 16969)
@@ -9,7 +9,4 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.PlatformHookOsx;
 
 /**
@@ -115,15 +112,15 @@
         this.movementMouseButton = movementMouseButton;
         switch (movementMouseButton) {
-        case MouseEvent.BUTTON1:
-            movementMouseButtonMask = MouseEvent.BUTTON1_DOWN_MASK;
-            break;
-        case MouseEvent.BUTTON2:
-            movementMouseButtonMask = MouseEvent.BUTTON2_DOWN_MASK;
-            break;
-        case MouseEvent.BUTTON3:
-            movementMouseButtonMask = MouseEvent.BUTTON3_DOWN_MASK;
-            break;
-        default:
-            throw new RuntimeException("Unsupported button");
+            case MouseEvent.BUTTON1:
+                movementMouseButtonMask = MouseEvent.BUTTON1_DOWN_MASK;
+                break;
+            case MouseEvent.BUTTON2:
+                movementMouseButtonMask = MouseEvent.BUTTON2_DOWN_MASK;
+                break;
+            case MouseEvent.BUTTON3:
+                movementMouseButtonMask = MouseEvent.BUTTON3_DOWN_MASK;
+                break;
+            default:
+                throw new RuntimeException("Unsupported button");
         }
     }
@@ -178,6 +175,6 @@
      */
     public static boolean isPlatformOsx() {
-        return Main.platform != null && Main.platform instanceof PlatformHookOsx;
+        String os = System.getProperty("os.name");
+        return os != null && os.toLowerCase().startsWith("mac os x");
     }
-
 }