mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -33,10 +33,7 @@ import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @author spleaner
|
||||
@@ -55,7 +52,7 @@ public class ExecutorRegistryImpl extends ExecutorRegistry {
|
||||
private final Map<String, AnAction> myContextActionId2Action = new HashMap<String, AnAction>();
|
||||
|
||||
// [Project, ExecutorId, RunnerId]
|
||||
private final Set<Trinity<Project, String, String>> myInProgress = new java.util.HashSet<Trinity<Project, String, String>>();
|
||||
private final Set<Trinity<Project, String, String>> myInProgress = Collections.synchronizedSet(new java.util.HashSet<Trinity<Project, String, String>>());
|
||||
|
||||
public ExecutorRegistryImpl(ActionManager actionManager) {
|
||||
myActionManager = actionManager;
|
||||
@@ -144,6 +141,19 @@ public class ExecutorRegistryImpl extends ExecutorRegistry {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void projectClosed(final Project project) {
|
||||
// perform cleanup
|
||||
synchronized (myInProgress) {
|
||||
for (Iterator<Trinity<Project, String, String>> it = myInProgress.iterator(); it.hasNext(); ) {
|
||||
final Trinity<Project, String, String> trinity = it.next();
|
||||
if (project.equals(trinity.first)) {
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user