Changeset 10625 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-07-24T13:42:32+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - Java 8: use more lambdas / method references

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MapStatus.java (modified) (4 diffs)
• tools/I18n.java (modified) (1 diff)

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

@@ -675 +675 @@
     }
 
-    private final transient AWTEventListener awtListener = new AWTEventListener() {
-         @Override
-         public void eventDispatched(AWTEvent event) {
-            if (event instanceof InputEvent &&
-                    ((InputEvent) event).getComponent() == mv) {
-                synchronized (collector) {
-                    int modifiers = ((InputEvent) event).getModifiersEx();
-                    Point mousePos = null;
-                    if (event instanceof MouseEvent) {
-                        mousePos = ((MouseEvent) event).getPoint();
-                    }
-                    collector.updateMousePosition(mousePos, modifiers);
-                }
-            }
-        }
-    };
+    private final transient AWTEventListener awtListener;
 
     private final transient MouseMotionListener mouseMotionListener = new MouseMotionListener() {
@@ -719 +704 @@
 
     private void registerListeners() {
-        // Listen to keyboard/mouse events for pressing/releasing alt key and
-        // inform the collector.
+        // Listen to keyboard/mouse events for pressing/releasing alt key and inform the collector.
         try {
             Toolkit.getDefaultToolkit().addAWTEventListener(awtListener,
                     AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
         } catch (SecurityException ex) {
+            Main.trace(ex);
             mv.addMouseMotionListener(mouseMotionListener);
             mv.addKeyListener(keyAdapter);
@@ -735 +720 @@
         } catch (SecurityException e) {
             // Don't care, awtListener probably wasn't registered anyway
-            if (Main.isTraceEnabled()) {
-                Main.trace(e.getMessage());
-            }
+            Main.trace(e);
         }
         mv.removeMouseMotionListener(mouseMotionListener);
@@ -826 +809 @@
         this.mv = mapFrame.mapView;
         this.collector = new Collector(mapFrame);
+        this.awtListener = event -> {
+            if (event instanceof InputEvent &&
+                    ((InputEvent) event).getComponent() == mv) {
+                synchronized (collector) {
+                    int modifiers = ((InputEvent) event).getModifiersEx();
+                    Point mousePos = null;
+                    if (event instanceof MouseEvent) {
+                        mousePos = ((MouseEvent) event).getPoint();
+                    }
+                    collector.updateMousePosition(mousePos, modifiers);
+                }
+            }
+        };
 
         // Context menu of status bar

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

@@ -737 +737 @@
 
     public static TranslationAdapter getTranslationAdapter() {
-        return (text, objects) -> I18n.tr(text, objects);
+        return I18n::tr;
     }