From da3c058a190f183066840ca55c0a74645c128310 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 14 Apr 2011 10:28:25 +0400 Subject: [PATCH] show warning when unable to modify --- .../lang-impl/src/com/intellij/ide/util/DeleteHandler.java | 7 ++++--- .../intellij/refactoring/inline/GenericInlineHandler.java | 2 +- .../intellij/refactoring/safeDelete/SafeDeleteHandler.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java index a458b57396e3..99c6273904e2 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java @@ -31,6 +31,7 @@ import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.ex.MessagesEx; import com.intellij.openapi.vfs.VirtualFile; @@ -112,10 +113,10 @@ public class DeleteHandler { if (safeDeleteApplicable && !dumb) { DeleteDialog dialog = new DeleteDialog(project, elements, new DeleteDialog.Callback() { public void run(final DeleteDialog dialog) { - if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, Arrays.asList(elements))) return; + if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, Arrays.asList(elements), true)) return; SafeDeleteProcessor.createInstance(project, new Runnable() { public void run() { - dialog.close(DeleteDialog.CANCEL_EXIT_CODE); + dialog.close(DialogWrapper.CANCEL_EXIT_CODE); } }, elements, dialog.isSearchInComments(), dialog.isSearchInNonJava(), true).run(); } @@ -174,7 +175,7 @@ public class DeleteHandler { ArrayList readOnlyFiles = new ArrayList(); getReadOnlyVirtualFiles(virtualFile, readOnlyFiles, ftManager); - if (readOnlyFiles.size() > 0) { + if (!readOnlyFiles.isEmpty()) { int _result = Messages.showYesNoDialog(project, IdeBundle.message("prompt.directory.contains.read.only.files", virtualFile.getPresentableUrl()), IdeBundle.message("title.delete"), Messages.getQuestionIcon()); diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java b/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java index 875bee27ff72..207d28df1ae1 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java @@ -119,7 +119,7 @@ public class GenericInlineHandler { elements.add(element); } - if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, elements)) { + if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, elements, true)) { return true; } ApplicationManager.getApplication().runWriteAction(new Runnable() { diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java index 190ba8e8c501..2f3f3db0ff6c 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java @@ -96,7 +96,7 @@ public class SafeDeleteHandler implements RefactoringActionHandler { ContainerUtil.addAll(fullElementsSet, temptoDelete); } - if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, fullElementsSet)) return; + if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, fullElementsSet, true)) return; final PsiElement[] elementsToDelete = PsiUtilBase.toPsiElementArray(fullElementsSet);