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

IDEA-83753 Gradle: Deliver gradle output when project libraries are being resolved on import

Browse Source 
1. Using a shared progress manager (it filters task state change by the task id);
2. Show non-cancellable progress bar for the gradle tasks;
This commit is contained in:
Denis.Zhdanov
2012-03-30 13:18:31 +04:00
parent 0a99721ccb
commit f1cf41da76
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/remote/GradleApiFacadeManager.java
+8 -6
View File
@@ -57,6 +57,7 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
/**
* Entry point to work with remote {@link GradleApiFacade}.
@@ -77,12 +78,13 @@ public class GradleApiFacadeManager {
private final ConcurrentMap<String /*project name*/, GradleApiFacade> myFacadeWrappers
= new ConcurrentWeakHashMap<String, GradleApiFacade>();
private final ConcurrentMap<String /*project name*/, RemoteGradleProgressNotificationManager> myRemoteNotificationManagers
= new ConcurrentWeakHashMap<String, RemoteGradleProgressNotificationManager>();
private final ConcurrentMap<String /*project name*/, Pair<GradleApiFacade, RemoteGradleProcessSettings>> myRemoteFacades
= new ConcurrentWeakHashMap<String, Pair<GradleApiFacade, RemoteGradleProcessSettings>>();
@NotNull private final GradleLibraryManager myGradleLibraryManager;
@NotNull private final GradleLibraryManager myGradleLibraryManager;
private final AtomicReference<RemoteGradleProgressNotificationManager> myExportedProgressManager
= new AtomicReference<RemoteGradleProgressNotificationManager>();
@NotNull private final GradleProgressNotificationManagerImpl myProgressManager;
// Please note that we don't use RemoteGradleProcessSettings as the 'Configuration' type parameter here because we need
@@ -283,14 +285,14 @@ public class GradleApiFacadeManager {
GradleLog.LOG.info("Instructing gradle to use java from " + newPair.second.getJavaHome());
}
result.applySettings(newPair.second);
RemoteGradleProgressNotificationManager exported = myRemoteNotificationManagers.get(project.getName());
RemoteGradleProgressNotificationManager exported = myExportedProgressManager.get();
if (exported == null) {
try {
exported = (RemoteGradleProgressNotificationManager)UnicastRemoteObject.exportObject(myProgressManager, 0);
myRemoteNotificationManagers.putIfAbsent(project.getName(), exported);
myExportedProgressManager.set(exported);
}
catch (RemoteException e) {
exported = myRemoteNotificationManagers.get(project.getName());
exported = myExportedProgressManager.get();
}
}
if (exported == null) {
plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class GradleUtil {
@Override
public void run() {
if (modal) {
ProgressManager.getInstance().run(new Task.Modal(project, GradleBundle.message("gradle.import.progress.text"), true) {
ProgressManager.getInstance().run(new Task.Modal(project, GradleBundle.message("gradle.import.progress.text"), false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
task.execute(indicator);