common method extracted

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
index 993f88a92998159587cc5e5ddc733923e06801b0..8489f0042542a62cf8588f219c1041926d586b3a 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.*;
+import com.intellij.openapi.roots.impl.OrderEntryUtil;
 import com.intellij.openapi.roots.impl.libraries.LibraryEx;
 import com.intellij.openapi.roots.impl.libraries.LibraryTableBase;
 import com.intellij.openapi.roots.libraries.Library;
@@ -236,16 +237,7 @@ public class LibrariesContainerFactory {
       if (myRootModel != null) {
         return myRootModel.getModuleLibraryTable().getLibraries();
       }
-      OrderEntry[] orderEntries = ModuleRootManager.getInstance(myModule).getOrderEntries();
-      List<Library> libraries = new ArrayList<Library>();
-      for (OrderEntry orderEntry : orderEntries) {
-        if (orderEntry instanceof LibraryOrderEntry) {
-          final LibraryOrderEntry entry = (LibraryOrderEntry)orderEntry;
-          if (entry.isModuleLevel()) {
-            libraries.add(entry.getLibrary());
-          }
-        }
-      }
+      List<Library> libraries = OrderEntryUtil.getModuleLibraries(ModuleRootManager.getInstance(myModule));
       return libraries.toArray(new Library[libraries.size()]);
     }
 

diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java
index d73c6d612f0c5feeca7b63f2814d456279233bcd..45f2d7c71a9a31799a4dbd4485aeaf27b23c52d7 100644 (file)
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java
@@ -31,6 +31,9 @@ import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class OrderEntryUtil {
   private OrderEntryUtil() {
   }
@@ -214,4 +217,19 @@ public class OrderEntryUtil {
     if (scope1 == DependencyScope.TEST || scope2 == DependencyScope.TEST) return DependencyScope.TEST;
     return scope1;
   }
+
+  @NotNull
+  public static List<Library> getModuleLibraries(@NotNull ModuleRootModel model) {
+    OrderEntry[] orderEntries = model.getOrderEntries();
+    List<Library> libraries = new ArrayList<Library>();
+    for (OrderEntry orderEntry : orderEntries) {
+      if (orderEntry instanceof LibraryOrderEntry) {
+        final LibraryOrderEntry entry = (LibraryOrderEntry)orderEntry;
+        if (entry.isModuleLevel()) {
+          libraries.add(entry.getLibrary());
+        }
+      }
+    }
+    return libraries;
+  }
 }