Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 9583)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java	(revision 9584)
@@ -17,6 +17,9 @@
  * 
  */
-public class DefaultMapController extends JMapController implements MouseListener,
-		MouseMotionListener, MouseWheelListener {
+public class DefaultMapController extends JMapController implements
+		MouseListener, MouseMotionListener, MouseWheelListener {
+
+	private static final int MOUSE_BUTTONS_MASK = MouseEvent.BUTTON3_DOWN_MASK
+			| MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK;
 
 	public DefaultMapController(JMapViewer map) {
@@ -38,15 +41,20 @@
 		if (!movementEnabled || !isMoving)
 			return;
-		if (lastDragPoint != null) {
-			Point p = e.getPoint();
-			int diffx = lastDragPoint.x - p.x;
-			int diffy = lastDragPoint.y - p.y;
-			map.moveMap(diffx, diffy);
+		// Is only right mouse button presed?
+		if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == MouseEvent.BUTTON3_DOWN_MASK) {
+
+			if (lastDragPoint != null) {
+				Point p = e.getPoint();
+				int diffx = lastDragPoint.x - p.x;
+				int diffy = lastDragPoint.y - p.y;
+				map.moveMap(diffx, diffy);
+			}
+			lastDragPoint = e.getPoint();
 		}
-		lastDragPoint = e.getPoint();
 	}
 
 	public void mouseClicked(MouseEvent e) {
-		if (doubleClickZoomEnabled && e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1)
+		if (doubleClickZoomEnabled && e.getClickCount() == 2
+				&& e.getButton() == MouseEvent.BUTTON1)
 			map.zoomIn(e.getPoint());
 	}