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

Do not store virtual files in map that is never cleared for IDEA-120732 (Throwable at com.intellij.cvsSupport2.actions.IgnoreFileAction$1.run)

Browse Source
This commit is contained in:
Bas Leijdekkers
2014-02-20 12:27:10 +01:00
parent 0cfd079cbb
commit 406ebb48e8
1 changed files with 54 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java
+54 -63
View File
@@ -38,7 +38,7 @@ import com.intellij.openapi.vcs.ui.Refreshable;
import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.HashMap;
import com.intellij.util.containers.MultiMap;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -53,7 +53,6 @@ public class IgnoreFileAction extends AnAction {
private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.actions.IgnoreFileAction");
private final CvsActionVisibility myVisibility = new CvsActionVisibility();
private final Map<VirtualFile,Set<VirtualFile>> myParentToSelectedChildren = new HashMap<VirtualFile, Set<VirtualFile>>();
public IgnoreFileAction() {
myVisibility.canBePerformedOnSeveralFiles();
@@ -66,12 +65,12 @@ public class IgnoreFileAction extends AnAction {
}
public void actionPerformed(AnActionEvent e) {
final MultiMap<VirtualFile, VirtualFile> parentToSelectedChildren = MultiMap.createSmartList();
final CvsContext context = CvsContextWrapper.createCachedInstance(e);
final VirtualFile[] selectedFiles = context.getSelectedFiles();
for (VirtualFile selectedFile : selectedFiles) {
final VirtualFile parent = selectedFile.getParent();
if (!myParentToSelectedChildren.containsKey(parent)) myParentToSelectedChildren.put(parent, new HashSet<VirtualFile>());
myParentToSelectedChildren.get(parent).add(selectedFile);
parentToSelectedChildren.putValue(parent, selectedFile);
try {
CvsUtil.ignoreFile(selectedFile);
}
@@ -80,7 +79,7 @@ public class IgnoreFileAction extends AnAction {
VcsBalloonProblemNotifier.showOverChangesView(context.getProject(), message, MessageType.ERROR);
}
}
refreshFilesAndStatuses(context);
refreshFilesAndStatuses(context, parentToSelectedChildren);
}
private static void refreshPanel(CvsContext context) {
@@ -91,71 +90,67 @@ public class IgnoreFileAction extends AnAction {
}
}
private void refreshFilesAndStatuses(final CvsContext context) {
private static void refreshFilesAndStatuses(final CvsContext context, final MultiMap<VirtualFile, VirtualFile> parentToSelectedChildren) {
final Refreshable refreshablePanel = context.getRefreshableDialog();
if (refreshablePanel != null) refreshablePanel.saveState();
final int[] refreshedParents = new int[]{0};
final Collection<VirtualFile> createdCvsIgnoreFiles = new ArrayList<VirtualFile>();
for (final VirtualFile parent : myParentToSelectedChildren.keySet()) {
parent.refresh(true, true, parentPostRefreshAction(refreshedParents, createdCvsIgnoreFiles, context, parent));
}
}
for (final VirtualFile parent : parentToSelectedChildren.keySet()) {
final Runnable runnable = new Runnable() {
public void run() {
try {
final VirtualFile cvsIgnoreFile =
CvsVfsUtil.refreshAndfFindChild(parent, CvsUtil.CVS_IGNORE_FILE);
if (cvsIgnoreFile == null) {
final String path = parent.getPath() + "/" + CvsUtil.CVS_IGNORE_FILE;
LOG.error(String.valueOf(CvsVfsUtil.findFileByPath(path)) + " " + parent.getPath() + " " +
new File(VfsUtil.virtualToIoFile(parent), CvsUtil.CVS_IGNORE_FILE).isFile());
return;
}
private Runnable parentPostRefreshAction(final int[] refreshedParents,
final Collection<VirtualFile> createdCvsIgnoreFiles,
final CvsContext context,
final VirtualFile parent) {
return new Runnable() {
public void run() {
try {
final VirtualFile cvsIgnoreFile = CvsVfsUtil.refreshAndfFindChild(parent, CvsUtil.CVS_IGNORE_FILE);
if (cvsIgnoreFile == null) {
final String path = parent.getPath() + "/" + CvsUtil.CVS_IGNORE_FILE;
LOG.error(String.valueOf(CvsVfsUtil.findFileByPath(path)) + " " + parent.getPath() + " " +
new File(VfsUtil.virtualToIoFile(parent), CvsUtil.CVS_IGNORE_FILE).isFile());
return;
if (!CvsUtil.fileIsUnderCvs(cvsIgnoreFile) &&
!ChangeListManager.getInstance(context.getProject()).isIgnoredFile(cvsIgnoreFile) &&
!CvsEntriesManager.getInstance().fileIsIgnored(cvsIgnoreFile)) {
createdCvsIgnoreFiles.add(cvsIgnoreFile);
}
final Collection<VirtualFile> filesToUpdateStatus = parentToSelectedChildren.get(parent);
for (final VirtualFile file : filesToUpdateStatus) {
FileStatusManager.getInstance(context.getProject()).fileStatusChanged(file);
VcsDirtyScopeManager.getInstance(context.getProject()).fileDirty(file);
}
}
if (!CvsUtil.fileIsUnderCvs(cvsIgnoreFile) &&
!ChangeListManager.getInstance(context.getProject()).isIgnoredFile(cvsIgnoreFile) &&
!CvsEntriesManager.getInstance().fileIsIgnored(cvsIgnoreFile)) {
createdCvsIgnoreFiles.add(cvsIgnoreFile);
}
final Set<VirtualFile> filesToUpdateStatus = myParentToSelectedChildren.get(parent);
for (final VirtualFile file : filesToUpdateStatus) {
FileStatusManager.getInstance(context.getProject()).fileStatusChanged(file);
VcsDirtyScopeManager.getInstance(context.getProject()).fileDirty(file);
finally {
refreshedParents[0]++;
if (refreshedParents[0] == parentToSelectedChildren.size()) {
// all parents are refreshed
if (createdCvsIgnoreFiles.isEmpty()) {
refreshPanel(context);
}
else {
addCvsIgnoreFilesToCvsAndRefreshPanel();
}
}
}
}
finally {
refreshedParents[0]++;
if (allParentsWasRefreshed(refreshedParents)) {
if (createdCvsIgnoreFiles.isEmpty()) {
private void addCvsIgnoreFilesToCvsAndRefreshPanel() {
createAddFilesAction().actionPerformed(createContext(createdCvsIgnoreFiles, context));
}
private AddFileOrDirectoryAction createAddFilesAction() {
return new AddFileOrDirectoryAction(CvsBundle.message("adding.cvsignore.files.to.cvs.action.name"), Options.ON_FILE_ADDING) {
protected void onActionPerformed(CvsContext context,
CvsTabbedWindow tabbedWindow,
boolean successfully,
CvsHandler handler) {
refreshPanel(context);
}
else {
addCvsIgnoreFilesToCvsAndRefreshPanel();
}
}
};
}
}
private void addCvsIgnoreFilesToCvsAndRefreshPanel() {
createAddFilesAction().actionPerformed(createContext(createdCvsIgnoreFiles, context));
}
private AddFileOrDirectoryAction createAddFilesAction() {
return new AddFileOrDirectoryAction(CvsBundle.message("adding.cvsignore.files.to.cvs.action.name"), Options.ON_FILE_ADDING) {
protected void onActionPerformed(CvsContext context,
CvsTabbedWindow tabbedWindow,
boolean successfully,
CvsHandler handler) {
refreshPanel(context);
}
};
}
};
};
parent.refresh(true, true, runnable);
}
}
private static CvsContextAdapter createContext(final Collection<VirtualFile> createdCvsIgnoreFiles, final CvsContext context) {
@@ -174,8 +169,4 @@ public class IgnoreFileAction extends AnAction {
}
};
}
private boolean allParentsWasRefreshed(final int[] refreshedParents) {
return refreshedParents[0] == myParentToSelectedChildren.size();
}
}