Ignore:
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/download
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

    r10378 r10611  
    110110
    111111        bookmarks = new BookmarkList();
    112         bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
    113             @Override
    114             public void valueChanged(ListSelectionEvent e) {
    115                 Bookmark b = bookmarks.getSelectedValue();
    116                 if (b != null && gui != null) {
    117                     gui.boundingBoxChanged(b.getArea(), BookmarkSelection.this);
    118                 }
     112        bookmarks.getSelectionModel().addListSelectionListener(e -> {
     113            Bookmark b = bookmarks.getSelectedValue();
     114            if (b != null && gui != null) {
     115                gui.boundingBoxChanged(b.getArea(), BookmarkSelection.this);
    119116            }
    120117        });

  • trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

    r10604 r10611  
    1414import java.awt.GridBagLayout;
    1515import java.awt.event.ActionEvent;
    16 import java.awt.event.ActionListener;
    1716import java.awt.event.InputEvent;
    1817import java.awt.event.KeyEvent;
    … …  
    3231import javax.swing.JTabbedPane;
    3332import javax.swing.KeyStroke;
    34 import javax.swing.event.ChangeEvent;
    3533import javax.swing.event.ChangeListener;
    3634
    … …  
    9492        JPanel pnl = new JPanel(new GridBagLayout());
    9593
    96         final ChangeListener checkboxChangeListener = new ChangeListener() {
    97             @Override
    98             public void stateChanged(ChangeEvent e) {
    99                 // size check depends on selected data source
    100                 updateSizeCheck();
    101             }
    102         };
     94        // size check depends on selected data source
     95        final ChangeListener checkboxChangeListener = e -> updateSizeCheck();
    10396
    10497        // adding the download tasks
    … …  
    159152                tr("<html>Autostart ''Download from OSM'' dialog every time JOSM is started.<br>" +
    160153                        "You can open it manually from File menu or toolbar.</html>"));
    161         cbStartup.addActionListener(new ActionListener() {
    162             @Override
    163             public void actionPerformed(ActionEvent e) {
    164                  Main.pref.put("download.autorun", cbStartup.isSelected());
    165             }
    166         });
     154        cbStartup.addActionListener(e -> Main.pref.put("download.autorun", cbStartup.isSelected()));
    167155
    168156        pnl.add(cbNewLayer, GBC.std().anchor(GBC.WEST).insets(5, 5, 5, 5));

  • trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java

    r10378 r10611  
    55
    66import java.awt.Component;
    7 import java.awt.event.ItemEvent;
    8 import java.awt.event.ItemListener;
    97import java.awt.event.WindowEvent;
    108import java.util.Arrays;
    … …  
    7068        fullRel.setSelected(Main.pref.getBoolean("downloadprimitive.full", true));
    7169
    72         cbType.addItemListener(new ItemListener() {
    73             @Override
    74             public void itemStateChanged(ItemEvent e) {
    75                 referrers.setText(cbType.getType() == OsmPrimitiveType.NODE
    76                         ? tr("Download referrers (parent relations and ways)")
    77                         : tr("Download referrers (parent relations)"));
    78             }
    79         });
     70        cbType.addItemListener(e -> referrers.setText(cbType.getType() == OsmPrimitiveType.NODE
     71                ? tr("Download referrers (parent relations and ways)")
     72                : tr("Download referrers (parent relations)")));
    8073
    8174        return Arrays.<Component>asList(referrers, fullRel, newLayer);

  • trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

    r10217 r10611  
    384384                if (!canceled) {
    385385                    // Nominatim sometimes returns garbage, see #5934, #10643
    386                     Main.warn(tr("Error occured with query ''{0}'': ''{1}''", urlString, e.getMessage()));
    387                     GuiHelper.runInEDTAndWait(new Runnable() {
    388                         @Override
    389                         public void run() {
    390                             HelpAwareOptionPane.showOptionDialog(
    391                                     Main.parent,
    392                                     tr("Name server returned invalid data. Please try again."),
    393                                     tr("Bad response"),
    394                                     JOptionPane.WARNING_MESSAGE, null
    395                             );
    396                         }
    397                     });
     386                    Main.warn(e, tr("Error occured with query ''{0}'': ''{1}''", urlString, e.getMessage()));
     387                    GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
     388                            Main.parent,
     389                            tr("Name server returned invalid data. Please try again."),
     390                            tr("Bad response"),
     391                            JOptionPane.WARNING_MESSAGE, null
     392                    ));
    398393                }
    399394            } catch (IOException | ParserConfigurationException e) {
Note: See TracChangeset for help on using the changeset viewer.