Changeset 431 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java

Timestamp:

2007-10-26T21:58:25+02:00 (17 years ago)

Author:

gebner

Message:

Make the applet code work again.

File:

• trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) (2 diffs)

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

@@ -17 +17 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.lang.reflect.InvocationTargetException;
 import java.text.DecimalFormat;
@@ -270 +272 @@
                 // Listen to keyboard/mouse events for pressing/releasing alt key and
                 // inform the collector.
-        Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener(){
-                public void eventDispatched(AWTEvent event) {
-                        synchronized (collector) {
-                                mouseState.modifiers = ((InputEvent)event).getModifiersEx();
-                                if (event instanceof MouseEvent)
-                                        mouseState.mousePos = ((MouseEvent)event).getPoint();
-                                collector.notify();
-                        }
-                }
-        }, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
+                try {
+                        Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener(){
+                                public void eventDispatched(AWTEvent event) {
+                                        synchronized (collector) {
+                                                mouseState.modifiers = ((InputEvent)event).getModifiersEx();
+                                                if (event instanceof MouseEvent)
+                                                        mouseState.mousePos = ((MouseEvent)event).getPoint();
+                                                collector.notify();
+                                        }
+                                }
+                        }, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
+                } catch (SecurityException ex) {
+                        mapFrame.mapView.addMouseMotionListener(new MouseMotionListener() {
+                                public void mouseMoved(MouseEvent e) {
+                                        synchronized (collector) {
+                                                mouseState.modifiers = e.getModifiersEx();
+                                                mouseState.mousePos = e.getPoint();
+                                                collector.notify();
+                                        }
+                                }
+
+                                public void mouseDragged(MouseEvent e) {
+                                        mouseMoved(e);
+                                }
+                        });
+
+                        mapFrame.mapView.addKeyListener(new KeyAdapter() {
+                                public void keyPressed(KeyEvent e) {
+                                        synchronized (collector) {
+                                                mouseState.modifiers = e.getModifiersEx();
+                                                collector.notify();
+                                        }
+                                }
+
+                                public void keyReleased(KeyEvent e) {
+                                        keyReleased(e);
+                                }
+                        });
+                }
         }