register JavadocManager as an independent service

java/openapi/src/com/intellij/psi/JavaPsiFacade.java

@@ -22,7 +22,6 @@ package com.intellij.psi;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.NotNullLazyKey;
-import com.intellij.psi.javadoc.JavadocManager;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiShortNamesCache;
 import org.jetbrains.annotations.NonNls;
@@ -140,15 +139,6 @@ public abstract class JavaPsiFacade {
   @NotNull
   public abstract PsiMigration startMigration();
 
-  /**
-   * Returns the JavaDoc manager for the project, which can be used to retrieve
-   * information about JavaDoc tags known to IDEA.
-   *
-   * @return the JavaDoc manager instance.
-   */
-  @NotNull
-  public abstract JavadocManager getJavadocManager();
-
   /**
    * Returns the name helper for the project, which can be used to validate
    * and parse Java identifiers.

java/openapi/src/com/intellij/psi/javadoc/JavadocManager.java

@@ -15,14 +15,25 @@
  */
 package com.intellij.psi.javadoc;
 
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author mike
  */
 public interface JavadocManager {
+  class SERVICE {
+    private SERVICE() {
+    }
+
+    public static JavadocManager getInstance(Project project) {
+      return ServiceManager.getService(project, JavadocManager.class);
+    }
+  }
+  
   @NotNull
   JavadocTagInfo[] getTagInfos(PsiElement context);