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

type migration: wait an answer from dialog even process is finished IDEA-150179

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-01-11 19:28:36 +03:00
parent f973d6b47f
commit ee4f459bc7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+9
View File
@@ -45,6 +45,7 @@ import com.intellij.refactoring.typeMigration.usageInfo.OverriderUsageInfo;
import com.intellij.refactoring.typeMigration.usageInfo.TypeMigrationUsageInfo;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.*;
import com.intellij.util.concurrency.Semaphore;
import com.intellij.util.containers.*;
import com.intellij.util.graph.DFSTBuilder;
import com.intellij.util.graph.GraphGenerator;
@@ -65,6 +66,7 @@ public class TypeMigrationLabeler {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeMigration.TypeMigrationLabeler");
private boolean myShowWarning = true;
private volatile MigrateException myException;
private final Semaphore myDialogSemaphore = new Semaphore();
public TypeMigrationRules getRules() {
return myRules;
@@ -756,6 +758,7 @@ public class TypeMigrationLabeler {
boolean addRoot(final TypeMigrationUsageInfo usageInfo, final PsiType type, final PsiElement place, boolean alreadyProcessed) {
if (myShowWarning && myMigrationRoots.size() > 10 && !ApplicationManager.getApplication().isUnitTestMode()) {
myShowWarning = false;
myDialogSemaphore.down();
try {
final Runnable checkTimeToStopRunnable = new Runnable() {
public void run() {
@@ -763,6 +766,7 @@ public class TypeMigrationLabeler {
Messages.getWarningIcon()) == Messages.YES) {
myException = new MigrateException();
}
myDialogSemaphore.up();
}
};
SwingUtilities.invokeLater(checkTimeToStopRunnable);
@@ -1023,6 +1027,11 @@ public class TypeMigrationLabeler {
iterate();
}
}
myDialogSemaphore.waitFor();
if (myException != null) {
throw myException;
}
}
public TypeEvaluator getTypeEvaluator() {