fix using getInstance() instead ID

VISTALL · VISTALL · commit 7a0cd06e2d95 · 2026-05-19T19:51:44.000+03:00
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/compiler/GroovyCompilerBase.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/compiler/GroovyCompilerBase.java
@@ -112,7 +112,7 @@ protected void runGroovycCompiler(CompileContext compileContext,
 
     Library[] libraries = GroovyConfigUtils.getInstance().getSDKLibrariesByModule(module);
     if (libraries.length > 0) {
-      classPathBuilder.addVirtualFiles(Arrays.asList(libraries[0].getFiles(BinariesOrderRootType.getInstance())));
+      classPathBuilder.addVirtualFiles(Arrays.asList(libraries[0].getFiles(BinariesOrderRootType.ID)));
     }
 
     JavaSdkType javaSdkType = (JavaSdkType)sdk.getSdkType();
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/config/GroovyLibraryPresentationProvider.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/config/GroovyLibraryPresentationProvider.java
@@ -69,7 +69,7 @@ public boolean isSDKHome(@Nonnull VirtualFile file) {
   protected void fillLibrary(String path, LibraryEditor libraryEditor) {
     File srcRoot = new File(path + "/src/main");
     if (srcRoot.exists()) {
-      libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(srcRoot), SourcesOrderRootType.getInstance());
+      libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(srcRoot), SourcesOrderRootType.ID);
     }
 
     File[] jars;
@@ -83,7 +83,7 @@ protected void fillLibrary(String path, LibraryEditor libraryEditor) {
     if (jars != null) {
       for (File file : jars) {
         if (file.getName().endsWith(".jar")) {
-          libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(file), BinariesOrderRootType.getInstance());
+          libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(file), BinariesOrderRootType.ID);
         }
       }
     }
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/grape/GrabDependencies.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/grape/GrabDependencies.java
@@ -298,11 +298,11 @@ private void addGrapeDependencies(List<VirtualFile> jars) {
             for (VirtualFile jar : jars) {
                 VirtualFile jarRoot = ArchiveVfsUtil.getJarRootForLocalFile(jar);
                 if (jarRoot != null) {
-                    OrderRootType rootType = BinariesOrderRootType.getInstance();
+                    String rootType = BinariesOrderRootType.ID;
                     String libName = "Grab:" + jar.getName();
                     for (String classifier : List.of("sources", "source", "src")) {
                         if (libName.endsWith("-" + classifier + ".jar")) {
-                            rootType = SourcesOrderRootType.getInstance();
+                            rootType = SourcesOrderRootType.ID;
                             libName = StringUtil.trimEnd(libName, "-" + classifier + ".jar") + ".jar";
                         }
                     }
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonFramework.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonFramework.java
@@ -398,7 +398,7 @@ public File getDefaultSdkWorkDir(@Nonnull Module module) {
 
   @Override
   public boolean isSDKLibrary(Library library) {
-    return GriffonLibraryPresentationProvider.isGriffonSdk(library.getFiles(BinariesOrderRootType.getInstance()));
+    return GriffonLibraryPresentationProvider.isGriffonSdk(library.getFiles(BinariesOrderRootType.ID));
   }
 
   @Override
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonLibraryPresentationProvider.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/griffon/GriffonLibraryPresentationProvider.java
@@ -57,7 +57,7 @@ protected void fillLibrary(String path, LibraryEditor libraryEditor) {
     if (jars != null) {
       for (String fileName : jars) {
         if (fileName.endsWith(".jar")) {
-          libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + ("/dist/") + fileName)), BinariesOrderRootType.getInstance());
+          libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + ("/dist/") + fileName)), BinariesOrderRootType.ID);
         }
       }
     }
@@ -66,7 +66,7 @@ protected void fillLibrary(String path, LibraryEditor libraryEditor) {
     if (jars != null) {
       for (String fileName : jars) {
         if (fileName.endsWith(".jar")) {
-          libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + "/lib/" + fileName)), BinariesOrderRootType.getInstance());
+          libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + "/lib/" + fileName)), BinariesOrderRootType.ID);
         }
       }
     }
@@ -123,7 +123,7 @@ public static boolean isGriffonSdk(VirtualFile[] files) {
   public static String getGriffonVersion(@Nonnull Module module) {
     for (OrderEntry orderEntry : ModuleRootManager.getInstance(module).getOrderEntries()) {
       if (orderEntry instanceof LibraryOrderEntry) {
-        VirtualFile[] files = orderEntry.getFiles(BinariesOrderRootType.getInstance());
+        VirtualFile[] files = orderEntry.getFiles(BinariesOrderRootType.ID);
         if (isGriffonSdk(files)) {
           return getGriffonVersion(files);
         }
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/ivy/AbstractAttachSourceProvider.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/ivy/AbstractAttachSourceProvider.java
@@ -69,9 +69,9 @@ protected static Library getLibraryFromOrderEntriesList(List<LibraryOrderEntry>
 
   protected void addSourceFile(@Nullable VirtualFile jarRoot, @Nonnull Library library) {
     if (jarRoot != null) {
-      if (!Arrays.asList(library.getFiles(SourcesOrderRootType.getInstance())).contains(jarRoot)) {
+      if (!Arrays.asList(library.getFiles(SourcesOrderRootType.ID)).contains(jarRoot)) {
         Library.ModifiableModel model = library.getModifiableModel();
-        model.addRoot(jarRoot, SourcesOrderRootType.getInstance());
+        model.addRoot(jarRoot, SourcesOrderRootType.ID);
         model.commit();
       }
     }
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/ivy/IvyAttachSourceProvider.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/ivy/IvyAttachSourceProvider.java
@@ -83,7 +83,7 @@ public Collection<AttachSourcesAction> getActions(List<LibraryOrderEntry> orderE
       if (srcFile != null) {
         // File already downloaded.
         VirtualFile jarRoot = ArchiveVfsUtil.getJarRootForLocalFile(srcFile);
-        if (jarRoot == null || ArrayUtil.contains(jarRoot, library.getFiles(SourcesOrderRootType.getInstance()))) {
+        if (jarRoot == null || ArrayUtil.contains(jarRoot, library.getFiles(SourcesOrderRootType.ID))) {
           return Collections.emptyList(); // Sources already attached.
         }
 
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/mvc/MvcFramework.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/mvc/MvcFramework.java
@@ -297,7 +297,7 @@ protected List<File> getImplicitClasspathRoots(@Nonnull Module module) {
 
     Library library = MvcModuleStructureUtil.findUserLibrary(module, getUserLibraryName());
     if (library != null) {
-      for (VirtualFile file : library.getFiles(BinariesOrderRootType.getInstance())) {
+      for (VirtualFile file : library.getFiles(BinariesOrderRootType.ID)) {
         toExclude.add(VirtualFileUtil.virtualToIoFile(VirtualFilePathUtil.getLocalFile(file)));
       }
     }
diff --git a/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/mvc/MvcModuleStructureUtil.java b/groovy-impl/src/main/java/org/jetbrains/plugins/groovy/impl/mvc/MvcModuleStructureUtil.java
@@ -405,7 +405,7 @@ public static void cleanupDefaultLibrary(Module module,
 
     final List<String> toRemoveUrls = new ArrayList<String>();
 
-    for (String url : library.getUrls(BinariesOrderRootType.getInstance())) {
+    for (String url : library.getUrls(BinariesOrderRootType.ID)) {
       VirtualFile virtualFile = virtualFileManager.findFileByUrl(url);
 
       if (virtualFile == null) {
@@ -426,7 +426,7 @@ public static void cleanupDefaultLibrary(Module module,
         public void accept(ModifiableRootModel model) {
           Library.ModifiableModel modifiableModel = modifyDefaultLibrary(model, libName);
           for (String url : toRemoveUrls) {
-            modifiableModel.removeRoot(url, BinariesOrderRootType.getInstance());
+            modifiableModel.removeRoot(url, BinariesOrderRootType.ID);
           }
           modifiableModel.commit();
         }
@@ -490,7 +490,7 @@ private static Set<String> getJarUrls(@Nullable Library library) {
 
     Set<String> res = new HashSet<String>();
 
-    for (String url : library.getUrls(BinariesOrderRootType.getInstance())) {
+    for (String url : library.getUrls(BinariesOrderRootType.ID)) {
       if (!library.isJarDirectory(url)) {
         res.add(url);
       }
@@ -721,16 +721,16 @@ public static void copyUserLibraries(ModuleRootModel from, ModifiableRootModel t
     }
 
     Library.ModifiableModel model = userLibraryTo.getModifiableModel();
-    for (String url : model.getUrls(BinariesOrderRootType.getInstance())) {
+    for (String url : model.getUrls(BinariesOrderRootType.ID)) {
       if (!model.isJarDirectory(url)) {
-        model.removeRoot(url, BinariesOrderRootType.getInstance());
+        model.removeRoot(url, BinariesOrderRootType.ID);
       }
     }
 
     if (userLibraryFrom != null) {
-      for (String url : userLibraryFrom.getUrls(BinariesOrderRootType.getInstance())) {
+      for (String url : userLibraryFrom.getUrls(BinariesOrderRootType.ID)) {
         if (!userLibraryFrom.isJarDirectory(url)) {
-          model.addRoot(url, BinariesOrderRootType.getInstance());
+          model.addRoot(url, BinariesOrderRootType.ID);
         }
       }
     }
diff --git a/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/config/GroovyConfigUtils.java b/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/config/GroovyConfigUtils.java
@@ -109,7 +109,7 @@ public boolean isSDKLibrary(Library library) {
     if (library == null) {
       return false;
     }
-    return LibrariesUtil.getGroovyLibraryHome(library.getFiles(BinariesOrderRootType.getInstance())) != null;
+    return LibrariesUtil.getGroovyLibraryHome(library.getFiles(BinariesOrderRootType.ID)) != null;
   }
 
   @Nullable
diff --git a/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java b/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationImpl.java
@@ -158,12 +158,6 @@ public <T extends PsiAnnotationMemberValue> T setDeclaredAttributeValue(@Nullabl
     return (T)PsiImplUtil.setDeclaredAttributeValue(this, attributeName, value, ANNOTATION_CREATOR);
   }
 
-  @Override
-  @Nullable
-  public PsiMetaData getMetaData() {
-    return null;
-  }
-
   @Override
   @Nonnull
   public GrCodeReferenceElement getClassReference() {
diff --git a/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightAnnotation.java b/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightAnnotation.java
@@ -139,11 +139,6 @@ public PsiAnnotationOwner getOwner() {
     return myOwner;
   }
 
-  @Override
-  public PsiMetaData getMetaData() {
-    return null;
-  }
-
   public void addAttribute(PsiNameValuePair pair) {
     if (pair instanceof GrAnnotationNameValuePair) {
       myAnnotationArgList.addAttribute((GrAnnotationNameValuePair)pair);
diff --git a/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/util/LibrariesUtil.java b/groovy-psi/src/main/java/org/jetbrains/plugins/groovy/util/LibrariesUtil.java
@@ -104,7 +104,7 @@ public static Library[] getGlobalLibraries(Condition<Library> condition) {
 
   @Nonnull
   public static String getGroovyLibraryHome(Library library) {
-    VirtualFile[] classRoots = library.getFiles(BinariesOrderRootType.getInstance());
+    VirtualFile[] classRoots = library.getFiles(BinariesOrderRootType.ID);
     String home = getGroovyLibraryHome(classRoots);
     return home == null ? "" : home;
   }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected void runGroovycCompiler(CompileContext compileContext,`
`112`	`112`
`113`	`113`	`Library[] libraries = GroovyConfigUtils.getInstance().getSDKLibrariesByModule(module);`
`114`	`114`	`if (libraries.length > 0) {`
`115`		`- classPathBuilder.addVirtualFiles(Arrays.asList(libraries[0].getFiles(BinariesOrderRootType.getInstance())));`
	`115`	`+ classPathBuilder.addVirtualFiles(Arrays.asList(libraries[0].getFiles(BinariesOrderRootType.ID)));`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`JavaSdkType javaSdkType = (JavaSdkType)sdk.getSdkType();`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public boolean isSDKHome(@Nonnull VirtualFile file) {`
`69`	`69`	`protected void fillLibrary(String path, LibraryEditor libraryEditor) {`
`70`	`70`	`File srcRoot = new File(path + "/src/main");`
`71`	`71`	`if (srcRoot.exists()) {`
`72`		`- libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(srcRoot), SourcesOrderRootType.getInstance());`
	`72`	`+ libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(srcRoot), SourcesOrderRootType.ID);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`File[] jars;`
`@@ -83,7 +83,7 @@ protected void fillLibrary(String path, LibraryEditor libraryEditor) {`
`83`	`83`	`if (jars != null) {`
`84`	`84`	`for (File file : jars) {`
`85`	`85`	`if (file.getName().endsWith(".jar")) {`
`86`		`- libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(file), BinariesOrderRootType.getInstance());`
	`86`	`+ libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(file), BinariesOrderRootType.ID);`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,11 +298,11 @@ private void addGrapeDependencies(List<VirtualFile> jars) {`
`298`	`298`	`for (VirtualFile jar : jars) {`
`299`	`299`	`VirtualFile jarRoot = ArchiveVfsUtil.getJarRootForLocalFile(jar);`
`300`	`300`	`if (jarRoot != null) {`
`301`		`- OrderRootType rootType = BinariesOrderRootType.getInstance();`
	`301`	`+ String rootType = BinariesOrderRootType.ID;`
`302`	`302`	`String libName = "Grab:" + jar.getName();`
`303`	`303`	`for (String classifier : List.of("sources", "source", "src")) {`
`304`	`304`	`if (libName.endsWith("-" + classifier + ".jar")) {`
`305`		`- rootType = SourcesOrderRootType.getInstance();`
	`305`	`+ rootType = SourcesOrderRootType.ID;`
`306`	`306`	`libName = StringUtil.trimEnd(libName, "-" + classifier + ".jar") + ".jar";`
`307`	`307`	`}`
`308`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ public File getDefaultSdkWorkDir(@Nonnull Module module) {`
`398`	`398`
`399`	`399`	`@Override`
`400`	`400`	`public boolean isSDKLibrary(Library library) {`
`401`		`- return GriffonLibraryPresentationProvider.isGriffonSdk(library.getFiles(BinariesOrderRootType.getInstance()));`
	`401`	`+ return GriffonLibraryPresentationProvider.isGriffonSdk(library.getFiles(BinariesOrderRootType.ID));`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected void fillLibrary(String path, LibraryEditor libraryEditor) {`
`57`	`57`	`if (jars != null) {`
`58`	`58`	`for (String fileName : jars) {`
`59`	`59`	`if (fileName.endsWith(".jar")) {`
`60`		`- libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + ("/dist/") + fileName)), BinariesOrderRootType.getInstance());`
	`60`	`+ libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + ("/dist/") + fileName)), BinariesOrderRootType.ID);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -66,7 +66,7 @@ protected void fillLibrary(String path, LibraryEditor libraryEditor) {`
`66`	`66`	`if (jars != null) {`
`67`	`67`	`for (String fileName : jars) {`
`68`	`68`	`if (fileName.endsWith(".jar")) {`
`69`		`- libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + "/lib/" + fileName)), BinariesOrderRootType.getInstance());`
	`69`	`+ libraryEditor.addRoot(VirtualFileUtil.getUrlForLibraryRoot(new File(path + "/lib/" + fileName)), BinariesOrderRootType.ID);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
`@@ -123,7 +123,7 @@ public static boolean isGriffonSdk(VirtualFile[] files) {`
`123`	`123`	`public static String getGriffonVersion(@Nonnull Module module) {`
`124`	`124`	`for (OrderEntry orderEntry : ModuleRootManager.getInstance(module).getOrderEntries()) {`
`125`	`125`	`if (orderEntry instanceof LibraryOrderEntry) {`
`126`		`- VirtualFile[] files = orderEntry.getFiles(BinariesOrderRootType.getInstance());`
	`126`	`+ VirtualFile[] files = orderEntry.getFiles(BinariesOrderRootType.ID);`
`127`	`127`	`if (isGriffonSdk(files)) {`
`128`	`128`	`return getGriffonVersion(files);`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,9 @@ protected static Library getLibraryFromOrderEntriesList(List<LibraryOrderEntry>`
`69`	`69`
`70`	`70`	`protected void addSourceFile(@Nullable VirtualFile jarRoot, @Nonnull Library library) {`
`71`	`71`	`if (jarRoot != null) {`
`72`		`- if (!Arrays.asList(library.getFiles(SourcesOrderRootType.getInstance())).contains(jarRoot)) {`
	`72`	`+ if (!Arrays.asList(library.getFiles(SourcesOrderRootType.ID)).contains(jarRoot)) {`
`73`	`73`	`Library.ModifiableModel model = library.getModifiableModel();`
`74`		`- model.addRoot(jarRoot, SourcesOrderRootType.getInstance());`
	`74`	`+ model.addRoot(jarRoot, SourcesOrderRootType.ID);`
`75`	`75`	`model.commit();`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public Collection<AttachSourcesAction> getActions(List<LibraryOrderEntry> orderE`
`83`	`83`	`if (srcFile != null) {`
`84`	`84`	`// File already downloaded.`
`85`	`85`	`VirtualFile jarRoot = ArchiveVfsUtil.getJarRootForLocalFile(srcFile);`
`86`		`- if (jarRoot == null \|\| ArrayUtil.contains(jarRoot, library.getFiles(SourcesOrderRootType.getInstance()))) {`
	`86`	`+ if (jarRoot == null \|\| ArrayUtil.contains(jarRoot, library.getFiles(SourcesOrderRootType.ID))) {`
`87`	`87`	`return Collections.emptyList(); // Sources already attached.`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ protected List<File> getImplicitClasspathRoots(@Nonnull Module module) {`
`297`	`297`
`298`	`298`	`Library library = MvcModuleStructureUtil.findUserLibrary(module, getUserLibraryName());`
`299`	`299`	`if (library != null) {`
`300`		`- for (VirtualFile file : library.getFiles(BinariesOrderRootType.getInstance())) {`
	`300`	`+ for (VirtualFile file : library.getFiles(BinariesOrderRootType.ID)) {`
`301`	`301`	`toExclude.add(VirtualFileUtil.virtualToIoFile(VirtualFilePathUtil.getLocalFile(file)));`
`302`	`302`	`}`
`303`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ public static void cleanupDefaultLibrary(Module module,`
`405`	`405`
`406`	`406`	`final List<String> toRemoveUrls = new ArrayList<String>();`
`407`	`407`
`408`		`- for (String url : library.getUrls(BinariesOrderRootType.getInstance())) {`
	`408`	`+ for (String url : library.getUrls(BinariesOrderRootType.ID)) {`
`409`	`409`	`VirtualFile virtualFile = virtualFileManager.findFileByUrl(url);`
`410`	`410`
`411`	`411`	`if (virtualFile == null) {`
`@@ -426,7 +426,7 @@ public static void cleanupDefaultLibrary(Module module,`
`426`	`426`	`public void accept(ModifiableRootModel model) {`
`427`	`427`	`Library.ModifiableModel modifiableModel = modifyDefaultLibrary(model, libName);`
`428`	`428`	`for (String url : toRemoveUrls) {`
`429`		`- modifiableModel.removeRoot(url, BinariesOrderRootType.getInstance());`
	`429`	`+ modifiableModel.removeRoot(url, BinariesOrderRootType.ID);`
`430`	`430`	`}`
`431`	`431`	`modifiableModel.commit();`
`432`	`432`	`}`
`@@ -490,7 +490,7 @@ private static Set<String> getJarUrls(@Nullable Library library) {`
`490`	`490`
`491`	`491`	`Set<String> res = new HashSet<String>();`
`492`	`492`
`493`		`- for (String url : library.getUrls(BinariesOrderRootType.getInstance())) {`
	`493`	`+ for (String url : library.getUrls(BinariesOrderRootType.ID)) {`
`494`	`494`	`if (!library.isJarDirectory(url)) {`
`495`	`495`	`res.add(url);`
`496`	`496`	`}`
`@@ -721,16 +721,16 @@ public static void copyUserLibraries(ModuleRootModel from, ModifiableRootModel t`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`Library.ModifiableModel model = userLibraryTo.getModifiableModel();`
`724`		`- for (String url : model.getUrls(BinariesOrderRootType.getInstance())) {`
	`724`	`+ for (String url : model.getUrls(BinariesOrderRootType.ID)) {`
`725`	`725`	`if (!model.isJarDirectory(url)) {`
`726`		`- model.removeRoot(url, BinariesOrderRootType.getInstance());`
	`726`	`+ model.removeRoot(url, BinariesOrderRootType.ID);`
`727`	`727`	`}`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`if (userLibraryFrom != null) {`
`731`		`- for (String url : userLibraryFrom.getUrls(BinariesOrderRootType.getInstance())) {`
	`731`	`+ for (String url : userLibraryFrom.getUrls(BinariesOrderRootType.ID)) {`
`732`	`732`	`if (!userLibraryFrom.isJarDirectory(url)) {`
`733`		`- model.addRoot(url, BinariesOrderRootType.getInstance());`
	`733`	`+ model.addRoot(url, BinariesOrderRootType.ID);`
`734`	`734`	`}`
`735`	`735`	`}`
`736`	`736`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public boolean isSDKLibrary(Library library) {`
`109`	`109`	`if (library == null) {`
`110`	`110`	`return false;`
`111`	`111`	`}`
`112`		`- return LibrariesUtil.getGroovyLibraryHome(library.getFiles(BinariesOrderRootType.getInstance())) != null;`
	`112`	`+ return LibrariesUtil.getGroovyLibraryHome(library.getFiles(BinariesOrderRootType.ID)) != null;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`@Nullable`