Changeset 10616 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-07-23T21:38:02+02:00 (7 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/tools

Files:

• ExceptionUtil.java (modified) (2 diffs)
• I18n.java (modified) (3 diffs)
• ImageProvider.java (modified) (8 diffs)
• MultikeyActionsHandler.java (modified) (3 diffs)
• PlatformHookUnixoid.java (modified) (1 diff)
• Utils.java (modified) (2 diffs)
• bugreport/BugReportSender.java (modified) (1 diff)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
+import org.openstreetmap.josm.tools.Utils.Function;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -141 +142 @@
             OsmPrimitive firstRefs = conflict.b.iterator().next();
             String objId = Long.toString(conflict.a.getId());
-            Collection<Long> refIds = Utils.transform(conflict.b, new Utils.Function<OsmPrimitive, Long>() {
-
-                @Override
-                public Long apply(OsmPrimitive x) {
-                    return x.getId();
-                }
-            });
+            Collection<Long> refIds = Utils.transform(conflict.b, (Function<OsmPrimitive, Long>) x -> x.getId());
             String refIdsString = refIds.size() == 1 ? refIds.iterator().next().toString() : refIds.toString();
             if (conflict.a instanceof Node) {

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

@@ -16 +16 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Locale;
@@ -382 +381 @@
         Locale[] l = new Locale[v.size()];
         l = v.toArray(l);
-        Arrays.sort(l, new Comparator<Locale>() {
-            @Override
-            public int compare(Locale o1, Locale o2) {
-                return o1.toString().compareTo(o2.toString());
-            }
-        });
+        Arrays.sort(l, (o1, o2) -> o1.toString().compareTo(o2.toString()));
         return l;
     }
@@ -743 +737 @@
 
     public static TranslationAdapter getTranslationAdapter() {
-        return new TranslationAdapter() {
-            @Override
-            public String tr(String text, Object... objects) {
-                return I18n.tr(text, objects);
-            }
-        };
+        return (text, objects) -> I18n.tr(text, objects);
     }
 

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

@@ -33 +33 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -76 +75 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -687 +685 @@
      * Load the image in a background thread.
      *
-     * This method returns immediately and runs the image request
-     * asynchronously.
+     * This method returns immediately and runs the image request asynchronously.
      *
      * @param callback a callback. It is called, when the image is ready.
@@ -697 +694 @@
     public void getInBackground(final ImageCallback callback) {
         if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)) {
-            Runnable fetch = new Runnable() {
-                @Override
-                public void run() {
-                    ImageIcon result = get();
-                    callback.finished(result);
-                }
-            };
-            IMAGE_FETCHER.submit(fetch);
+            IMAGE_FETCHER.submit(() -> callback.finished(get()));
         } else {
-            ImageIcon result = get();
-            callback.finished(result);
+            callback.finished(get());
         }
     }
@@ -714 +703 @@
      * Load the image in a background thread.
      *
-     * This method returns immediately and runs the image request
-     * asynchronously.
+     * This method returns immediately and runs the image request asynchronously.
      *
      * @param callback a callback. It is called, when the image is ready.
@@ -725 +713 @@
     public void getInBackground(final ImageResourceCallback callback) {
         if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(WIKI_PROTOCOL)) {
-            Runnable fetch = new Runnable() {
-                @Override
-                public void run() {
-                    callback.finished(getResource());
-                }
-            };
-            IMAGE_FETCHER.submit(fetch);
+            IMAGE_FETCHER.submit(() -> callback.finished(getResource()));
         } else {
             callback.finished(getResource());
@@ -1280 +1262 @@
             });
 
-            parser.setEntityResolver(new EntityResolver() {
-                @Override
-                public InputSource resolveEntity(String publicId, String systemId) {
-                    return new InputSource(new ByteArrayInputStream(new byte[0]));
-                }
-            });
+            parser.setEntityResolver((publicId, systemId) -> new InputSource(new ByteArrayInputStream(new byte[0])));
 
             CachedFile cf = new CachedFile(base + fn).setDestDir(
@@ -1508 +1485 @@
         // Check if the presets have icons for nodes/relations.
         if (!OsmPrimitiveType.WAY.equals(primitive.getType())) {
-            final Collection<TaggingPreset> presets = new TreeSet<>(new Comparator<TaggingPreset>() {
-                @Override
-                public int compare(TaggingPreset o1, TaggingPreset o2) {
-                    final int o1TypesSize = o1.types == null || o1.types.isEmpty() ? Integer.MAX_VALUE : o1.types.size();
-                    final int o2TypesSize = o2.types == null || o2.types.isEmpty() ? Integer.MAX_VALUE : o2.types.size();
-                    return Integer.compare(o1TypesSize, o2TypesSize);
-                }
+            final Collection<TaggingPreset> presets = new TreeSet<>((o1, o2) -> {
+                final int o1TypesSize = o1.types == null || o1.types.isEmpty() ? Integer.MAX_VALUE : o1.types.size();
+                final int o2TypesSize = o2.types == null || o2.types.isEmpty() ? Integer.MAX_VALUE : o2.types.size();
+                return Integer.compare(o1TypesSize, o2TypesSize);
             });
             presets.addAll(TaggingPresets.getMatchingPresets(primitive));

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

@@ -7 +7 @@
 import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
@@ -63 +62 @@
                         String.valueOf(info.getShortcut()), info.getDescription()));
                 item.setMnemonic(info.getShortcut());
-                item.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        action.action.executeMultikeyAction(info.getIndex(), false);
-                    }
-                });
+                item.addActionListener(e -> action.action.executeMultikeyAction(info.getIndex(), false));
                 layers.add(item);
             }
@@ -79 +73 @@
                             "Repeat " + lastLayer.getDescription()));
                     repeateItem.setMnemonic(action.shortcut.getKeyStroke().getKeyCode());
-                    repeateItem.addActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            action.action.executeMultikeyAction(-1, true);
-                        }
-                    });
+                    repeateItem.addActionListener(e -> action.action.executeMultikeyAction(-1, true));
                     layers.add(repeateItem);
                 }

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

@@ -421 +421 @@
     // Method unused, but kept for translation already done. To reuse during Java 9 migration
     protected void askUpdateJava(final String version, final String url) {
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override
-            public void run() {
-                ExtendedDialog ed = new ExtendedDialog(
-                        Main.parent,
-                        tr("Outdated Java version"),
-                        new String[]{tr("OK"), tr("Update Java"), tr("Cancel")});
-                // Check if the dialog has not already been permanently hidden by user
-                if (!ed.toggleEnable("askUpdateJava9").toggleCheckState()) {
-                    ed.setButtonIcons(new String[]{"ok", "java", "cancel"}).setCancelButton(3);
-                    ed.setMinimumSize(new Dimension(480, 300));
-                    ed.setIcon(JOptionPane.WARNING_MESSAGE);
-                    StringBuilder content = new StringBuilder(tr("You are running version {0} of Java.", "<b>"+version+"</b>"))
-                            .append("<br><br>");
-                    if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor")) && !isOpenJDK()) {
-                        content.append("<b>").append(tr("This version is no longer supported by {0} since {1} and is not recommended for use.",
-                                "Oracle", tr("April 2015"))).append("</b><br><br>"); // TODO: change date once Java 8 EOL is announced
-                    }
-                    content.append("<b>")
-                           .append(tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", "8"))
-                           .append("</b><br><br>")
-                           .append(tr("Would you like to update now ?"));
-                    ed.setContent(content.toString());
-
-                    if (ed.showDialog().getValue() == 2) {
-                        try {
-                            openUrl(url);
-                        } catch (IOException e) {
-                            Main.warn(e);
-                        }
+        GuiHelper.runInEDTAndWait(() -> {
+            ExtendedDialog ed = new ExtendedDialog(
+                    Main.parent,
+                    tr("Outdated Java version"),
+                    new String[]{tr("OK"), tr("Update Java"), tr("Cancel")});
+            // Check if the dialog has not already been permanently hidden by user
+            if (!ed.toggleEnable("askUpdateJava9").toggleCheckState()) {
+                ed.setButtonIcons(new String[]{"ok", "java", "cancel"}).setCancelButton(3);
+                ed.setMinimumSize(new Dimension(480, 300));
+                ed.setIcon(JOptionPane.WARNING_MESSAGE);
+                StringBuilder content = new StringBuilder(tr("You are running version {0} of Java.", "<b>"+version+"</b>"))
+                        .append("<br><br>");
+                if ("Sun Microsystems Inc.".equals(System.getProperty("java.vendor")) && !isOpenJDK()) {
+                    content.append("<b>").append(tr("This version is no longer supported by {0} since {1} and is not recommended for use.",
+                            "Oracle", tr("April 2015"))).append("</b><br><br>"); // TODO: change date once Java 8 EOL is announced
+                }
+                content.append("<b>")
+                       .append(tr("JOSM will soon stop working with this version; we highly recommend you to update to Java {0}.", "8"))
+                       .append("</b><br><br>")
+                       .append(tr("Would you like to update now ?"));
+                ed.setContent(content.toString());
+
+                if (ed.showDialog().getValue() == 2) {
+                    try {
+                        openUrl(url);
+                    } catch (IOException e) {
+                        Main.warn(e);
                     }
                 }

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

@@ -1374 +1374 @@
      */
     public static Executor newDirectExecutor() {
-        return new Executor() {
-            @Override
-            public void execute(Runnable command) {
-                command.run();
-            }
-        };
+        return command -> command.run();
     }
 
@@ -1620 +1615 @@
     public static void setObjectsAccessible(final AccessibleObject ... objects) {
         if (objects != null && objects.length > 0) {
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                @Override
-                public Object run() {
-                    for (AccessibleObject o : objects) {
-                        o.setAccessible(true);
-                    }
-                    return null;
+            AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
+                for (AccessibleObject o : objects) {
+                    o.setAccessible(true);
                 }
+                return null;
             });
         }

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

@@ -132 +132 @@
     private void failed(String string) {
         errorMessage = string;
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                JPanel errorPanel = new JPanel(new GridBagLayout());
-                errorPanel.add(new JMultilineLabel(
-                        tr("Opening the bug report failed. Please report manually using this website:")),
-                        GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-                errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-                errorPanel.add(new DebugTextDisplay(statusText));
+        SwingUtilities.invokeLater(() -> {
+            JPanel errorPanel = new JPanel(new GridBagLayout());
+            errorPanel.add(new JMultilineLabel(
+                    tr("Opening the bug report failed. Please report manually using this website:")),
+                    GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+            errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
+            errorPanel.add(new DebugTextDisplay(statusText));
 
-                JOptionPane.showMessageDialog(Main.parent, errorPanel, tr("You have encountered a bug in JOSM"),
-                        JOptionPane.ERROR_MESSAGE);
-            }
+            JOptionPane.showMessageDialog(Main.parent, errorPanel, tr("You have encountered a bug in JOSM"),
+                    JOptionPane.ERROR_MESSAGE);
         });
     }