MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

maven libs in arq containers

Browse Source
This commit is contained in:
Nikolay Mikhaylov
2015-08-28 16:01:45 +03:00
parent eb68a494b6
commit 9af0bc6939
2 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAttachHandler.java
+4 -2
View File
@@ -381,7 +381,7 @@ public class RepositoryAttachHandler {
List<MavenId> mavenIds,
List<MavenExtraArtifactType> extraTypes,
Collection<MavenRepositoryInfo> repositories,
final Processor<List<MavenArtifact>> resultProcessor,
@Nullable final Processor<List<MavenArtifact>> resultProcessor,
ProgressIndicator indicator) {
boolean cancelled = false;
final Collection<MavenArtifact> result = new LinkedHashSet<MavenArtifact>();
@@ -434,7 +434,9 @@ public class RepositoryAttachHandler {
DumbService.allowStartingDumbModeInside(DumbModePermission.MAY_START_BACKGROUND, new Runnable() {
@Override
public void run() {
resultProcessor.process(new ArrayList<MavenArtifact>(result));
if (resultProcessor != null) {
resultProcessor.process(new ArrayList<MavenArtifact>(result));
}
}
});
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryUtils.java
+67 -38
View File
@@ -53,6 +53,18 @@ public class RepositoryUtils {
@NotNull static public final String ReleaseVersionId = "RELEASE";
@NotNull static public final String SnapshotVersionSuffix = "-SNAPSHOT";
public static void downloadAsync(final Project project,
final boolean downloadSources,
final boolean downloadJavaDocs,
@NotNull final RepositoryLibraryProperties properties) {
String displayName = RepositoryLibraryDescription.findDescription(properties).getDisplayName();
Task task = new Task.Backgroundable(project, ProjectBundle.message("maven.loading.library.hint", displayName), false) {
public void run(@NotNull ProgressIndicator indicator) {
List<OrderRoot> download = download(project, downloadSources, downloadJavaDocs, properties);
}
};
ProgressManager.getInstance().run(task);
}
public static List<OrderRoot> download(Project project,
boolean downloadSources,
boolean downloadJavaDocs,
@@ -162,14 +174,14 @@ public class RepositoryUtils {
return result;
}
public static void loadDependencies(@NotNull ProgressIndicator indicator,
@NotNull final Project project,
@NotNull final LibraryEx library,
boolean downloadSources,
boolean downloadJavaDocs) {
indicator.setText(ProjectBundle.message("maven.loading.library.hint", library.getName()));
@NotNull final RepositoryLibraryProperties libraryProperties = (RepositoryLibraryProperties)library.getProperties();
final String storageRoot = getStorageRoot(library, project);
public static synchronized void loadDependencies(@NotNull ProgressIndicator indicator,
@NotNull final Project project,
RepositoryLibraryProperties libraryProperties,
boolean downloadSources,
boolean downloadJavaDocs,
String displayName,
Processor<List<MavenArtifact>> processor) {
indicator.setText(ProjectBundle.message("maven.loading.library.hint", displayName));
RepositoryAttachHandler.doResolveInner(
project,
@@ -178,39 +190,56 @@ public class RepositoryUtils {
resolveEffectiveVersion(project, libraryProperties))),
createExtraArtifactTypeList(downloadSources, downloadJavaDocs),
RepositoryLibraryDescription.findDescription(libraryProperties).getRemoteRepositories(),
new Processor<List<MavenArtifact>>() {
@Override
public boolean process(List<MavenArtifact> artifacts) {
if (artifacts == null || artifacts.isEmpty()) {
return true;
}
final List<OrderRoot> roots = RepositoryAttachHandler.createRoots(artifacts, storageRoot);
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
if (library.isDisposed()) {
return;
}
AccessToken token = WriteAction.start();
try {
final NewLibraryEditor editor = new NewLibraryEditor(null, libraryProperties);
editor.removeAllRoots();
editor.addRoots(roots);
final Library.ModifiableModel model = library.getModifiableModel();
editor.applyTo((LibraryEx.ModifiableModelEx)model);
model.commit();
}
finally {
token.finish();
}
}
});
return true;
}
},
processor,
indicator);
}
public static void loadDependencies(@NotNull ProgressIndicator indicator,
@NotNull final Project project,
@NotNull final LibraryEx library,
boolean downloadSources,
boolean downloadJavaDocs) {
final String storageRoot = getStorageRoot(library, project);
final RepositoryLibraryProperties libraryProperties = (RepositoryLibraryProperties)library.getProperties();
loadDependencies(indicator,
project,
libraryProperties,
downloadSources,
downloadJavaDocs,
library.getName(),
new Processor<List<MavenArtifact>>() {
@Override
public boolean process(List<MavenArtifact> artifacts) {
if (artifacts == null || artifacts.isEmpty()) {
return true;
}
final List<OrderRoot> roots = RepositoryAttachHandler.createRoots(artifacts, storageRoot);
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
if (library.isDisposed()) {
return;
}
AccessToken token = WriteAction.start();
try {
final NewLibraryEditor editor = new NewLibraryEditor(null, libraryProperties);
editor.removeAllRoots();
editor.addRoots(roots);
final Library.ModifiableModel model = library.getModifiableModel();
editor.applyTo((LibraryEx.ModifiableModelEx)model);
model.commit();
}
finally {
token.finish();
}
}
});
return true;
}
});
}
public static void reloadDependencies(@NotNull ProgressIndicator indicator,
@NotNull final Project project,
@NotNull final LibraryEx library) {