Index: applications/editors/josm/plugins/namemanager/.checkstyle
===================================================================
--- applications/editors/josm/plugins/namemanager/.checkstyle	(revision 32549)
+++ applications/editors/josm/plugins/namemanager/.checkstyle	(revision 32549)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="JOSM" location="/JOSM/tools/checkstyle/josm_checks.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="DerivedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="data"/>
+    <filter-data value="images"/>
+    <filter-data value="styles"/>
+    <filter-data value="resources"/>
+    <filter-data value="scripts"/>
+  </filter>
+</fileset-config>
Index: applications/editors/josm/plugins/namemanager/.project
===================================================================
--- applications/editors/josm/plugins/namemanager/.project	(revision 32548)
+++ applications/editors/josm/plugins/namemanager/.project	(revision 32549)
@@ -16,7 +16,13 @@
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
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 32548)
+++ 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 32548)
+++ 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 32548)
+++ 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 32548)
+++ 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 32548)
+++ 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 32548)
+++ 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.