javadoc and external annotations roots moved from ModuleRootModel to a separate extension

java/openapi/src/com/intellij/openapi/roots/AnnotationOrderRootType.java

@@ -15,7 +15,7 @@
  */
 package com.intellij.openapi.roots;
 
-import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
@@ -63,12 +63,12 @@ public class AnnotationOrderRootType extends PersistentOrderRootType {
       @Override
       public List<VirtualFile> visitModuleSourceOrderEntry(final ModuleSourceOrderEntry orderEntry,
                                                            final List<VirtualFile> value) {
-        Collections.addAll(value, orderEntry.getRootModel().getRootPaths(getInstance()));
+        Collections.addAll(value, orderEntry.getRootModel().getModuleExtension(JavaModuleExternalPaths.class).getExternalAnnotationsRoots());
         return value;
       }
     };
     entry.accept(policy, result);
-    return VfsUtil.toVirtualFileArray(result);
+    return VfsUtilCore.toVirtualFileArray(result);
   }
 
   @NotNull
@@ -90,7 +90,7 @@ public class AnnotationOrderRootType extends PersistentOrderRootType {
       @Override
       public List<String> visitModuleSourceOrderEntry(final ModuleSourceOrderEntry orderEntry,
                                                            final List<String> value) {
-        Collections.addAll(value, orderEntry.getRootModel().getRootUrls(getInstance()));
+        Collections.addAll(value, orderEntry.getRootModel().getModuleExtension(JavaModuleExternalPaths.class).getExternalAnnotationsUrls());
         return value;
       }
     };

java/openapi/src/com/intellij/openapi/roots/JavaModuleExternalPaths.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.roots;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author nik
+ */
+public abstract class JavaModuleExternalPaths extends ModuleExtension<JavaModuleExternalPaths> {
+
+  public static JavaModuleExternalPaths getInstance(Module module) {
+    return ModuleRootManager.getInstance(module).getModuleExtension(JavaModuleExternalPaths.class);
+  }
+
+  @NotNull
+  public abstract VirtualFile[] getExternalAnnotationsRoots();
+
+  @NotNull
+  public abstract String[] getExternalAnnotationsUrls();
+
+  public abstract void setExternalAnnotationUrls(@NotNull String[] urls);
+
+
+  @NotNull
+  public abstract String[] getJavadocUrls();
+
+  public abstract void setJavadocUrls(@NotNull String[] urls);
+
+
+}

java/openapi/src/com/intellij/openapi/roots/JavadocOrderRootType.java

@@ -51,7 +51,7 @@ public class JavadocOrderRootType extends PersistentOrderRootType {
       @Override
       public List<String> visitModuleSourceOrderEntry(final ModuleSourceOrderEntry orderEntry,
                                                            final List<String> value) {
-        Collections.addAll(value, orderEntry.getRootModel().getRootUrls(getInstance()));
+        Collections.addAll(value, orderEntry.getRootModel().getModuleExtension(JavaModuleExternalPaths.class).getJavadocUrls());
         return value;
       }
     };