Changeset 35160 in osm for applications

Timestamp:

2019-09-29T22:03:18+02:00 (5 years ago)

Author:

donvip

Message:

use lambdas for Runnable

Location:

applications/editors/josm/plugins/geochat/src/geochat

Files:

• ChatPaneManager.java (modified) (1 diff)
• ChatServerConnection.java (modified) (1 diff)
• GeoChatPanel.java (modified) (4 diffs)
• JsonQueryUtil.java (modified) (1 diff)

applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java

@@ -102 +102 @@
         final String nline = line.startsWith("\n") ? line : "\n" + line;
         final JTextPane thepane = chatPanes.get(userName).pane;
-        GuiHelper.runInEDT(new Runnable() {
-            @Override
-            public void run() {
-                Document doc = thepane.getDocument();
-                try {
-                    SimpleAttributeSet attrs = null;
-                    if (messageType != MESSAGE_TYPE_DEFAULT) {
-                        attrs = new SimpleAttributeSet();
-                        if (messageType == MESSAGE_TYPE_INFORMATION)
-                            StyleConstants.setItalic(attrs, true);
-                        else if (messageType == MESSAGE_TYPE_ATTENTION)
-                            StyleConstants.setForeground(attrs, COLOR_ATTENTION);
-                    }
-                    doc.insertString(doc.getLength(), nline, attrs);
-                } catch (BadLocationException ex) {
-                    Logging.warn(ex);
+        GuiHelper.runInEDT(() -> {
+            Document doc = thepane.getDocument();
+            try {
+                SimpleAttributeSet attrs = null;
+                if (messageType != MESSAGE_TYPE_DEFAULT) {
+                    attrs = new SimpleAttributeSet();
+                    if (messageType == MESSAGE_TYPE_INFORMATION)
+                        StyleConstants.setItalic(attrs, true);
+                    else if (messageType == MESSAGE_TYPE_ATTENTION)
+                        StyleConstants.setForeground(attrs, COLOR_ATTENTION);
                 }
-                thepane.setCaretPosition(doc.getLength());
+                doc.insertString(doc.getLength(), nline, attrs);
+            } catch (BadLocationException ex) {
+                Logging.warn(ex);
             }
+            thepane.setCaretPosition(doc.getLength());
         });
     }

applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java

@@ -116 +116 @@
             return;
         }
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    int cnt = 10;
-                    while (getPosition() == null && cnt-- > 0) {
-                        Thread.sleep(200);
-                    }
-                } catch (InterruptedException e) {
-                    Logging.warn(e);
-                }
-                autoLogin(userName);
-            }
+        new Thread(() -> {
+            try {
+                int cnt = 10;
+                while (getPosition() == null && cnt-- > 0) {
+                    Thread.sleep(200);
+                }
+            } catch (InterruptedException e) {
+                Logging.warn(e);
+            }
+            autoLogin(userName);
         }).start();
     }

applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java

@@ -235 +235 @@
             title = title + " (" + comment + ")";
         final String alarm = (alarmLevel <= 0 ? "" : alarmLevel == 1 ? "* " : "!!! ") + title;
-        GuiHelper.runInEDT(new Runnable() {
-            @Override
-            public void run() {
-                setTitle(alarm);
-            }
-        });
+        GuiHelper.runInEDT(() -> setTitle(alarm));
     }
 
@@ -259 +254 @@
         Config.getPref().put("geochat.username", userName);
         if (gcPanel.getComponentCount() == 1) {
-            GuiHelper.runInEDTAndWait(new Runnable() {
-                @Override
-                public void run() {
-                    gcPanel.remove(0);
-                    gcPanel.add(tabs, BorderLayout.CENTER);
-                    gcPanel.add(input, BorderLayout.SOUTH);
-                }
+            GuiHelper.runInEDTAndWait(() -> {
+                gcPanel.remove(0);
+                gcPanel.add(tabs, BorderLayout.CENTER);
+                gcPanel.add(input, BorderLayout.SOUTH);
             });
         }
@@ -274 +266 @@
     public void notLoggedIn(final String reason) {
         if (reason != null) {
-            GuiHelper.runInEDT(new Runnable() {
-                @Override
-                public void run() {
-                    new Notification(tr("Failed to log in to GeoChat:") + "\n" + reason).show();
-                }
-            });
+            GuiHelper.runInEDT(() -> new Notification(tr("Failed to log in to GeoChat:") + '\n' + reason).show());
         } else {
             // regular logout
@@ -292 +279 @@
     @Override
     public void messageSendFailed(final String reason) {
-        GuiHelper.runInEDT(new Runnable() {
-            @Override
-            public void run() {
-                new Notification(tr("Failed to send message:") + "\n" + reason).show();
-            }
-        });
+        GuiHelper.runInEDT(() -> new Notification(tr("Failed to send message:") + '\n' + reason).show());
     }
 

applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java

@@ -90 +90 @@
     public void run() {
         if (EventQueue.isDispatchThread()) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    doRealRun();
-                }
-            }).start();
+            new Thread(this::doRealRun).start();
         } else {
             doRealRun();