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

Merge branch 'master' of git@git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Kirill Kalishev
2010-11-19 20:58:58 +03:00
parent da84137b7c 30cc6ef74d
commit 99681d7117
5 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
+1 -1
View File
@@ -158,7 +158,7 @@ public class JavaFindUsagesProvider implements FindUsagesProvider {
PsiMethod psiMethod = (PsiMethod)element;
String formatted = PsiFormatUtil.formatMethod(psiMethod,
PsiSubstitutor.EMPTY, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_PARAMETERS,
PsiFormatUtil.SHOW_TYPE);
PsiFormatUtil.SHOW_TYPE|PsiFormatUtil.SHOW_RAW_NON_TOP_TYPE);
PsiClass psiClass = psiMethod.getContainingClass();
if (psiClass != null) {
return getContainingClassDescription(psiClass, formatted);
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
+16
View File
@@ -36,6 +36,8 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.progress.impl.ProgressManagerImpl;
import com.intellij.openapi.progress.util.ProgressWrapper;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectUtil;
import com.intellij.openapi.ui.Messages;
@@ -459,6 +461,11 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
cleanup((InspectionManagerEx)manager);
throw e;
}
catch (IndexNotReadyException e) {
cleanup((InspectionManagerEx)manager);
DumbService.getInstance(myProject).showDumbModeNotification("Usage search is not available until indices are ready");
throw new ProcessCanceledException();
}
catch (Exception e) {
LOG.error(e);
}
@@ -489,6 +496,9 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
catch (ProcessCanceledException e) {
throw e;
}
catch (IndexNotReadyException e) {
throw e;
}
catch (Exception e) {
LOG.error(e);
}
@@ -501,6 +511,9 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
catch (ProcessCanceledException e) {
throw e;
}
catch (IndexNotReadyException e) {
throw e;
}
catch (Exception e) {
LOG.error(e);
}
@@ -534,6 +547,9 @@ public class GlobalInspectionContextImpl implements GlobalInspectionContext {
catch (ProcessCanceledException e) {
throw e;
}
catch (IndexNotReadyException e) {
throw e;
}
catch (Exception e) {
LOG.error(e);
}
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
+3 -1
View File
@@ -368,7 +368,9 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
panel.disposeUI();
}
myPanels.clear();
Disposer.dispose(mySelectionAlarm);
if (mySelectionAlarm != null) {
Disposer.dispose(mySelectionAlarm);
}
}
public void selectProfile(String name) {
platform/platform-resources-en/src/messages/RefactoringBundle.properties
+1 -1
View File
@@ -559,7 +559,7 @@ directory.chooser.hide.non.existent.checkBox.text=&Hide non-existent
0.will.be.inaccessible.from.1={0} will be inaccessible from {1}
move.classes.command=Moving {0} to package {1}
safe.delete.command=Deleting {0}
select.all.button=&Select all
select.all.button=Select &all
unselect.all.button=&Unselect all
automatic.renamer.enity.name.column={0} name
automatic.renamer.rename.to.column=Rename To
platform/util/src/com/intellij/util/io/PagedFileStorage.java
+6 -2
View File
@@ -215,8 +215,12 @@ public class PagedFileStorage implements Forceable {
}
public void close() {
force();
unmapAll();
try {
force();
}
finally {
unmapAll();
}
}
private void unmapAll() {