From dcb52cc6bf68c06653aaafbdae02a40e985e67eb Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 30 Oct 2009 14:00:01 +0300 Subject: [PATCH] return to usage view if user discard to make read only files writable (IDEADEV-41109) --- .../src/com/intellij/usages/impl/UsageViewImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index bcf026ef7206..506d95256237 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -864,12 +864,14 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra return myUsageSearcherFactory != null; } - private void checkReadonlyUsages() { + private boolean checkReadonlyUsages() { final Set readOnlyUsages = getReadOnlyUsagesFiles(); if (!readOnlyUsages.isEmpty()) { - ReadonlyStatusHandler.getInstance(myProject).ensureFilesWritable(readOnlyUsages.toArray(new VirtualFile[readOnlyUsages.size()])); + return + !ReadonlyStatusHandler.getInstance(myProject).ensureFilesWritable(readOnlyUsages.toArray(new VirtualFile[readOnlyUsages.size()])).hasReadonlyFiles(); } + return true; } private Set getReadOnlyUsages() { @@ -1268,7 +1270,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra } public void run() { - checkReadonlyUsages(); + if (!checkReadonlyUsages()) return; PsiDocumentManager.getInstance(myProject).commitAllDocuments(); if (myCannotMakeString != null && myChangesDetected) { if (canPerformReRun() && allTargetsAreValid()) {