MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upsource-master

Browse Source
This commit is contained in:
Evgeny Pasynkov
2012-06-18 15:15:18 +02:00
parent a61f306df2 332b692e1f
commit c2c3178b69
43 changed files with 243 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java
+5 -15
View File
@@ -51,10 +51,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
* @author cdr
@@ -337,22 +334,15 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
VirtualFile libVirtFile = VirtualFileManager.getInstance().findFileByUrl(url);
assert libVirtFile != null : libPath;
final ModuleRootManager manager = ModuleRootManager.getInstance(module);
final ModifiableRootModel rootModel = manager.getModifiableModel();
final Library jarLibrary = rootModel.getModuleLibraryTable().createLibrary();
final Library.ModifiableModel libraryModel = jarLibrary.getModifiableModel();
libraryModel.addRoot(libVirtFile, OrderRootType.CLASSES);
libraryModel.commit();
boolean inTests = false;
if (location != null) {
final VirtualFile vFile = location.getContainingFile().getVirtualFile();
if (vFile != null && ModuleRootManager.getInstance(module).getFileIndex().isInTestSourceContent(vFile)) {
final LibraryOrderEntry orderEntry = rootModel.findLibraryOrderEntry(jarLibrary);
orderEntry.setScope(DependencyScope.TEST);
inTests = true;
}
}
rootModel.commit();
ModuleRootModificationUtil.addModuleLibrary(module, null, Collections.singletonList(libVirtFile.getUrl()),
Collections.<String>emptyList(), inTests ? DependencyScope.TEST : DependencyScope.COMPILE);
}
private static void showCircularWarningAndContinue(final Project project, final Pair<Module, Module> circularModules,