Index: /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java
===================================================================
--- /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 33305)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 33306)
@@ -13,5 +13,4 @@
 import java.awt.Window;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -109,13 +108,10 @@
         JMenu aboutMenu = new JMenu(tr("About"));
         JMenuItem aboutAppButton = new JMenuItem(tr("About Plugin"));
-        aboutAppButton.addActionListener(new ActionListener() {
-
-            public void actionPerformed(ActionEvent arg0) {
-                String newline = System.getProperty("line.separator");
-                JOptionPane.showMessageDialog(NameManagerDialog.this, "Authors:" + newline + "Rafal Jachowicz, Marek Strassenburg-Kleciak"
-                        + newline + "Consultant:" + newline + "Stefanie Otte" + newline + "Powered by:" + newline
-                        + "Harman Becker Automotive Systems GmbH" + newline + "Neusoft Technology Solutions GmbH", tr("About"),
-                        JOptionPane.INFORMATION_MESSAGE);
-            }
+        aboutAppButton.addActionListener(e -> {
+            String newline = System.getProperty("line.separator");
+            JOptionPane.showMessageDialog(NameManagerDialog.this, "Authors:" + newline + "Rafal Jachowicz, Marek Strassenburg-Kleciak"
+                    + newline + "Consultant:" + newline + "Stefanie Otte" + newline + "Powered by:" + newline
+                    + "Harman Becker Automotive Systems GmbH" + newline + "Neusoft Technology Solutions GmbH", tr("About"),
+                    JOptionPane.INFORMATION_MESSAGE);
         });
         aboutMenu.add(aboutAppButton);
@@ -283,45 +279,43 @@
             }
         }
-        country.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                String countryName = (String) country.getSelectedItem();
-                if (CountryDataMemory.getCountryCache().containsKey(countryName)) {
-                    Country countryItem = CountryDataMemory.getCountryCache().get(countryName);
-                    labelLevel1.setText("  " + countryItem.getLevel1());
-                    if ("  n/a".equals(labelLevel1.getText())) {
-                        level1.setEnabled(false);
-                    } else {
-                        level1.setEnabled(true);
-                    }
-                    labelLevel2.setText("  " + countryItem.getLevel2());
-                    if ("  n/a".equals(labelLevel2.getText())) {
-                        level2.setEnabled(false);
-                    } else {
-                        level2.setEnabled(true);
-                    }
-                    labelLevel3.setText("  " + countryItem.getLevel3());
-                    if ("  n/a".equals(labelLevel3.getText())) {
-                        level3.setEnabled(false);
-                    } else {
-                        level3.setEnabled(true);
-                    }
-                    labelLevel4.setText("  " + countryItem.getLevel4());
-                    if ("  n/a".equals(labelLevel4.getText())) {
-                        level4.setEnabled(false);
-                    } else {
-                        level4.setEnabled(true);
-                    }
-                    labelLevel5.setText("  " + countryItem.getLevel5());
-                    if ("  n/a".equals(labelLevel5.getText())) {
-                        level5.setEnabled(false);
-                    } else {
-                        level5.setEnabled(true);
-                    }
-                    labelLevel6.setText("  " + countryItem.getLevel6());
-                    if ("  n/a".equals(labelLevel6.getText())) {
-                        level6.setEnabled(false);
-                    } else {
-                        level6.setEnabled(true);
-                    }
+        country.addActionListener(e -> {
+            String countryName1 = (String) country.getSelectedItem();
+            if (CountryDataMemory.getCountryCache().containsKey(countryName1)) {
+                Country countryItem = CountryDataMemory.getCountryCache().get(countryName1);
+                labelLevel1.setText("  " + countryItem.getLevel1());
+                if ("  n/a".equals(labelLevel1.getText())) {
+                    level1.setEnabled(false);
+                } else {
+                    level1.setEnabled(true);
+                }
+                labelLevel2.setText("  " + countryItem.getLevel2());
+                if ("  n/a".equals(labelLevel2.getText())) {
+                    level2.setEnabled(false);
+                } else {
+                    level2.setEnabled(true);
+                }
+                labelLevel3.setText("  " + countryItem.getLevel3());
+                if ("  n/a".equals(labelLevel3.getText())) {
+                    level3.setEnabled(false);
+                } else {
+                    level3.setEnabled(true);
+                }
+                labelLevel4.setText("  " + countryItem.getLevel4());
+                if ("  n/a".equals(labelLevel4.getText())) {
+                    level4.setEnabled(false);
+                } else {
+                    level4.setEnabled(true);
+                }
+                labelLevel5.setText("  " + countryItem.getLevel5());
+                if ("  n/a".equals(labelLevel5.getText())) {
+                    level5.setEnabled(false);
+                } else {
+                    level5.setEnabled(true);
+                }
+                labelLevel6.setText("  " + countryItem.getLevel6());
+                if ("  n/a".equals(labelLevel6.getText())) {
+                    level6.setEnabled(false);
+                } else {
+                    level6.setEnabled(true);
                 }
             }
@@ -391,5 +385,6 @@
         }
 
-        public void actionPerformed(ActionEvent arg0) {
+        @Override
+        public void actionPerformed(ActionEvent e) {
             if (selectedWay != null && waysInsideSelectedArea != null && !waysInsideSelectedArea.isEmpty()) {
                 if (tabPanel.getSelectedIndex() == 0) {
@@ -417,4 +412,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             if (selectedWay != null && waysInsideSelectedArea != null && !waysInsideSelectedArea.isEmpty()) {
@@ -444,4 +440,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             setVisible(false);
@@ -461,4 +458,5 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             if (selectedWay != null && waysInsideSelectedArea != null && !waysInsideSelectedArea.isEmpty()) {