Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java	(revision 32493)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/NameManagerPlugin.java	(revision 32549)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.namemanager;
 
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/Country.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/Country.java	(revision 32493)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/Country.java	(revision 32549)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.namemanager.countryData;
 
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/CountryDataMemory.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/CountryDataMemory.java	(revision 32493)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/countryData/CountryDataMemory.java	(revision 32549)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.namemanager.countryData;
 
@@ -4,7 +5,11 @@
 import java.util.Map;
 
-public class CountryDataMemory {
+public final class CountryDataMemory {
 
     private static Map<String, Country> countryCache;
+    
+    private CountryDataMemory() {
+        // Hide default constructor for utilities classes
+    }
 
     public static void instantiateCountryCache() {
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 32493)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java	(revision 32549)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.namemanager.dialog;
 
@@ -55,5 +56,5 @@
  * 
  */
-public class NameManagerDialog extends JDialog {
+public final class NameManagerDialog extends JDialog {
 
     private static final String TAG_NAME = "Tag name";
@@ -382,5 +383,5 @@
     class AddModifyAction extends AbstractAction {
 
-        public AddModifyAction() {
+        AddModifyAction() {
             putValue(Action.NAME, tr(ADD) + "/" + tr(EDIT));
             ImageIcon addModifyIcon = ImageProvider.get("", "addnode");
@@ -408,5 +409,5 @@
     class DeleteAction extends AbstractAction {
 
-        public DeleteAction() {
+        DeleteAction() {
             putValue(Action.NAME, tr(DELETE));
             ImageIcon deleteIcon = ImageProvider.get("", "purge");
@@ -434,5 +435,5 @@
     class CancelAction extends AbstractAction {
 
-        public CancelAction() {
+        CancelAction() {
             putValue(Action.NAME, tr("Cancel"));
             putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
@@ -451,5 +452,5 @@
     class SaveAction extends AbstractAction {
 
-        public SaveAction() {
+        SaveAction() {
             putValue(Action.NAME, tr("Save"));
             putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0));
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 32493)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 32549)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.namemanager.listeners;
 
Index: applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java
===================================================================
--- applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 32493)
+++ applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java	(revision 32549)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.namemanager.utils;
 
@@ -26,5 +27,10 @@
 import org.xml.sax.SAXException;
 
-public class NameManagerUtils {
+public final class NameManagerUtils {
+
+    private NameManagerUtils() {
+        // Hide default constructor for utilities classes
+    }
+
     /**
      * @return the top {@link Window} of the JOSM application.