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

refactoring+duplicates+invokeLater: don't overspecify modality, add disposed checks

Browse Source
This commit is contained in:
peter
2017-05-03 16:55:49 +02:00
parent 487e04ef3c
commit 5a7559c85f
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.ChangeContextUtil;
import com.intellij.codeInsight.generation.GenerateMembersUtil;
import com.intellij.lang.findUsages.DescriptiveNameUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
@@ -459,7 +458,7 @@ public class IntroduceParameterProcessor extends BaseRefactoringProcessor implem
}
if (isReplaceDuplicates()) {
ApplicationManager.getApplication().invokeLater(() -> processMethodsDuplicates(), ModalityState.NON_MODAL, myProject.getDisposed());
ApplicationManager.getApplication().invokeLater(() -> processMethodsDuplicates(), myProject.getDisposed());
}
}
java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java
+2 -3
View File
@@ -24,7 +24,6 @@ import com.intellij.lang.ContextAwareActionHandler;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
@@ -204,7 +203,7 @@ public class MethodDuplicatesHandler implements RefactoringActionHandler, Contex
if (ApplicationManager.getApplication().isUnitTestMode()) {
nothingFoundRunnable.run();
} else {
ApplicationManager.getApplication().invokeLater(nothingFoundRunnable, ModalityState.NON_MODAL);
ApplicationManager.getApplication().invokeLater(nothingFoundRunnable, project.getDisposed());
}
}
} else {
@@ -239,7 +238,7 @@ public class MethodDuplicatesHandler implements RefactoringActionHandler, Contex
a.finish();
}
};
ApplicationManager.getApplication().invokeLater(replaceRunnable, ModalityState.NON_MODAL);
ApplicationManager.getApplication().invokeLater(replaceRunnable, project.getDisposed());
}
public static List<Match> hasDuplicates(final PsiFile file, final PsiMember member) {