Changeset 10611 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/plugin

Timestamp:

2016-07-23T18:46:45+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes containing only one method should become lambdas

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/plugin

Files:

• PluginListPanel.java (modified) (3 diffs)
• PluginPreference.java (modified) (7 diffs)
• PluginPreferencesModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -15 +15 @@
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkEvent.EventType;
-import javax.swing.event.HyperlinkListener;
 
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -151 +149 @@
             HtmlPanel description = new HtmlPanel();
             description.setText(pi.getDescriptionAsHtml());
-            description.getEditorPane().addHyperlinkListener(new HyperlinkListener() {
-                @Override
-                public void hyperlinkUpdate(HyperlinkEvent e) {
-                    if (e.getEventType() == EventType.ACTIVATED) {
-                        OpenBrowser.displayUrl(e.getURL().toString());
-                    }
+            description.getEditorPane().addHyperlinkListener(e -> {
+                if (e.getEventType() == EventType.ACTIVATED) {
+                    OpenBrowser.displayUrl(e.getURL().toString());
                 }
             });
@@ -170 +165 @@
         repaint();
         if (visibleRect != null && visibleRect.width > 0 && visibleRect.height > 0) {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    scrollRectToVisible(visibleRect);
-                }
-            });
+            SwingUtilities.invokeLater(() -> scrollRectToVisible(visibleRect));
         }
     }

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -150 +150 @@
         sb.append("</html>");
         if (!GraphicsEnvironment.isHeadless()) {
-            GuiHelper.runInEDTAndWait(new Runnable() {
-                @Override
-                public void run() {
-                    HelpAwareOptionPane.showOptionDialog(
-                            parent,
-                            sb.toString(),
-                            tr("Update plugins"),
-                            !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
-                                    HelpUtil.ht("/Preferences/Plugins")
-                            );
-                }
-            });
+            GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
+                    parent,
+                    sb.toString(),
+                    tr("Update plugins"),
+                    !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
+                            HelpUtil.ht("/Preferences/Plugins")
+                    ));
         }
     }
@@ -318 +313 @@
     public void readLocalPluginInformation() {
         final ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask();
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                if (!task.isCanceled()) {
-                    SwingUtilities.invokeLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            model.setAvailablePlugins(task.getAvailablePlugins());
-                            pnlPluginPreferences.refreshView();
-                        }
-                    });
-                }
+        Runnable r = () -> {
+            if (!task.isCanceled()) {
+                SwingUtilities.invokeLater(() -> {
+                    model.setAvailablePlugins(task.getAvailablePlugins());
+                    pnlPluginPreferences.refreshView();
+                });
             }
         };
@@ -357 +346 @@
             }
             final ReadRemotePluginInformationTask task = new ReadRemotePluginInformationTask(pluginSites);
-            Runnable continuation = new Runnable() {
-                @Override
-                public void run() {
-                    if (!task.isCanceled()) {
-                        SwingUtilities.invokeLater(new Runnable() {
-                            @Override
-                            public void run() {
-                                model.updateAvailablePlugins(task.getAvailablePlugins());
-                                pnlPluginPreferences.refreshView();
-                                Main.pref.putInteger("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
-                            }
-                        });
-                    }
+            Runnable continuation = () -> {
+                if (!task.isCanceled()) {
+                    SwingUtilities.invokeLater(() -> {
+                        model.updateAvailablePlugins(task.getAvailablePlugins());
+                        pnlPluginPreferences.refreshView();
+                        Main.pref.putInteger("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
+                    });
                 }
             };
@@ -389 +372 @@
         protected void alertNothingToUpdate() {
             try {
-                SwingUtilities.invokeAndWait(new Runnable() {
-                    @Override
-                    public void run() {
-                        HelpAwareOptionPane.showOptionDialog(
-                                pnlPluginPreferences,
-                                tr("All installed plugins are up to date. JOSM does not have to download newer versions."),
-                                tr("Plugins up to date"),
-                                JOptionPane.INFORMATION_MESSAGE,
-                                null // FIXME: provide help context
-                                );
-                    }
-                });
+                SwingUtilities.invokeAndWait(() -> HelpAwareOptionPane.showOptionDialog(
+                        pnlPluginPreferences,
+                        tr("All installed plugins are up to date. JOSM does not have to download newer versions."),
+                        tr("Plugins up to date"),
+                        JOptionPane.INFORMATION_MESSAGE,
+                        null // FIXME: provide help context
+                        ));
             } catch (InterruptedException | InvocationTargetException e) {
                 Main.error(e);
@@ -421 +399 @@
             // to be run asynchronously after the plugin download
             //
-            final Runnable pluginDownloadContinuation = new Runnable() {
-                @Override
-                public void run() {
-                    if (pluginDownloadTask.isCanceled())
-                        return;
-                    boolean restartRequired = false;
-                    for (PluginInformation pi : pluginDownloadTask.getDownloadedPlugins()) {
-                        if (!model.getNewlyActivatedPlugins().contains(pi) || !pi.canloadatruntime) {
-                            restartRequired = true;
-                            break;
-                        }
-                    }
-                    notifyDownloadResults(pnlPluginPreferences, pluginDownloadTask, restartRequired);
-                    model.refreshLocalPluginVersion(pluginDownloadTask.getDownloadedPlugins());
-                    model.clearPendingPlugins(pluginDownloadTask.getDownloadedPlugins());
-                    GuiHelper.runInEDT(new Runnable() {
-                        @Override
-                        public void run() {
-                            pnlPluginPreferences.refreshView();
-                        }
-                    });
-                }
+            final Runnable pluginDownloadContinuation = () -> {
+                if (pluginDownloadTask.isCanceled())
+                    return;
+                boolean restartRequired = false;
+                for (PluginInformation pi : pluginDownloadTask.getDownloadedPlugins()) {
+                    if (!model.getNewlyActivatedPlugins().contains(pi) || !pi.canloadatruntime) {
+                        restartRequired = true;
+                        break;
+                    }
+                }
+                notifyDownloadResults(pnlPluginPreferences, pluginDownloadTask, restartRequired);
+                model.refreshLocalPluginVersion(pluginDownloadTask.getDownloadedPlugins());
+                model.clearPendingPlugins(pluginDownloadTask.getDownloadedPlugins());
+                GuiHelper.runInEDT(pnlPluginPreferences::refreshView);
             };
 
             // to be run asynchronously after the plugin list download
             //
-            final Runnable pluginInfoDownloadContinuation = new Runnable() {
-                @Override
-                public void run() {
-                    if (pluginInfoDownloadTask.isCanceled())
-                        return;
-                    model.updateAvailablePlugins(pluginInfoDownloadTask.getAvailablePlugins());
-                    // select plugins which actually have to be updated
-                    //
-                    Iterator<PluginInformation> it = toUpdate.iterator();
-                    while (it.hasNext()) {
-                        PluginInformation pi = it.next();
-                        if (!pi.isUpdateRequired()) {
-                            it.remove();
-                        }
-                    }
-                    if (toUpdate.isEmpty()) {
-                        alertNothingToUpdate();
-                        return;
-                    }
-                    pluginDownloadTask.setPluginsToDownload(toUpdate);
-                    Main.worker.submit(pluginDownloadTask);
-                    Main.worker.submit(pluginDownloadContinuation);
-                }
+            final Runnable pluginInfoDownloadContinuation = () -> {
+                if (pluginInfoDownloadTask.isCanceled())
+                    return;
+                model.updateAvailablePlugins(pluginInfoDownloadTask.getAvailablePlugins());
+                // select plugins which actually have to be updated
+                //
+                Iterator<PluginInformation> it = toUpdate.iterator();
+                while (it.hasNext()) {
+                    PluginInformation pi = it.next();
+                    if (!pi.isUpdateRequired()) {
+                        it.remove();
+                    }
+                }
+                if (toUpdate.isEmpty()) {
+                    alertNothingToUpdate();
+                    return;
+                }
+                pluginDownloadTask.setPluginsToDownload(toUpdate);
+                Main.worker.submit(pluginDownloadTask);
+                Main.worker.submit(pluginDownloadContinuation);
             };
 
@@ -476 +443 @@
         }
     }
-
 
     /**
@@ -509 +475 @@
 
         @Override
-        public void changedUpdate(DocumentEvent arg0) {
+        public void changedUpdate(DocumentEvent evt) {
             filter();
         }
 
         @Override
-        public void insertUpdate(DocumentEvent arg0) {
+        public void insertUpdate(DocumentEvent evt) {
             filter();
         }
 
         @Override
-        public void removeUpdate(DocumentEvent arg0) {
+        public void removeUpdate(DocumentEvent evt) {
             filter();
         }

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -150 +149 @@
         Collections.sort(
                 availablePlugins,
-                new Comparator<PluginInformation>() {
-                    @Override
-                    public int compare(PluginInformation o1, PluginInformation o2) {
-                        String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase(Locale.ENGLISH);
-                        String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase(Locale.ENGLISH);
-                        return n1.compareTo(n2);
-                    }
+                (o1, o2) -> {
+                    String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase(Locale.ENGLISH);
+                    String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase(Locale.ENGLISH);
+                    return n1.compareTo(n2);
                 }
         );