Index: trunk/tools/checkstyle/src/org/openstreetmap/josm/TopLevelJavadocCheck.java
===================================================================
--- trunk/tools/checkstyle/checks/org/openstreetmap/josm/TopLevelJavadocCheck.java	(revision 12582)
+++ trunk/tools/checkstyle/src/org/openstreetmap/josm/TopLevelJavadocCheck.java	(revision 12586)
@@ -13,12 +13,21 @@
  * Checks that there is Javadoc for every top level class, interface or enum.
  */
-public class TopLevelJavadocCheck extends AbstractCheck
-{
+public class TopLevelJavadocCheck extends AbstractCheck {
+
     private boolean foundTopLevelClass;
 
     @Override
-    public int[] getDefaultTokens()
-    {
+    public int[] getAcceptableTokens() {
+        return getDefaultTokens();
+    }
+
+    @Override
+    public int[] getDefaultTokens() {
         return new int[]{TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF, TokenTypes.ENUM_DEF};
+    }
+
+    @Override
+    public int[] getRequiredTokens() {
+        return new int[0];
     }
 
@@ -75,6 +84,5 @@
 
     @Override
-    public void visitToken(DetailAST ast)
-    {
+    public void visitToken(DetailAST ast) {
         DetailAST parent = ast.getParent();
         if (parent == null || parent.getType() == TokenTypes.EOF) {
Index: trunk/tools/checkstyle/src/org/openstreetmap/josm/checkstyle-metadata.properties
===================================================================
--- trunk/tools/checkstyle/src/org/openstreetmap/josm/checkstyle-metadata.properties	(revision 12586)
+++ trunk/tools/checkstyle/src/org/openstreetmap/josm/checkstyle-metadata.properties	(revision 12586)
@@ -0,0 +1,4 @@
+JosmCustomChecks.desc = JOSM custom Checkstyle modules.
+
+TopLevelJavadoc.name = Top-Level Javadoc
+TopLevelJavadoc.desc = Checks that there is Javadoc for every top level class, interface or enum
Index: trunk/tools/checkstyle/src/org/openstreetmap/josm/checkstyle-metadata.xml
===================================================================
--- trunk/tools/checkstyle/src/org/openstreetmap/josm/checkstyle-metadata.xml	(revision 12586)
+++ trunk/tools/checkstyle/src/org/openstreetmap/josm/checkstyle-metadata.xml	(revision 12586)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE checkstyle-metadata PUBLIC
+"-//eclipse-cs//DTD Check Metadata 1.1//EN"
+"http://eclipse-cs.sourceforge.net/dtds/checkstyle-metadata_1_1.dtd">
+<checkstyle-metadata>
+    <rule-group-metadata name="JOSM custom checks"  priority="1600">
+        <description>%JosmCustomChecks.desc</description>
+
+        <rule-metadata name="%TopLevelJavadoc.name" internal-name="TopLevelJavadoc" parent="TreeWalker">
+            <alternative-name internal-name="org.openstreetmap.josm.TopLevelJavadocCheck" />
+            <description>%TopLevelJavadoc.desc</description>
+        </rule-metadata>
+    </rule-group-metadata>
+</checkstyle-metadata>
Index: trunk/tools/checkstyle/src/org/openstreetmap/josm/messages.properties
===================================================================
--- trunk/tools/checkstyle/src/org/openstreetmap/josm/messages.properties	(revision 12586)
+++ trunk/tools/checkstyle/src/org/openstreetmap/josm/messages.properties	(revision 12586)
@@ -0,0 +1,1 @@
+