diff options
Diffstat (limited to 'plugins/cvs/cvs-plugin/src/com')
3 files changed, 21 insertions, 25 deletions
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java index e76f2f061485..80efbd46f8fa 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,13 +58,13 @@ public class MergeAction extends AnAction { final VcsContext context = CvsContextWrapper.createCachedInstance(e); final VirtualFile[] files = context.getSelectedFiles(); - if (files == null || files.length == 0) return; + if (files.length == 0) return; + final Project project = context.getProject(); final ReadonlyStatusHandler.OperationStatus operationStatus = - ReadonlyStatusHandler.getInstance(context.getProject()).ensureFilesWritable(files); + ReadonlyStatusHandler.getInstance(project).ensureFilesWritable(files); if (operationStatus.hasReadonlyFiles()) { return; } - final Project project = context.getProject(); AbstractVcsHelper.getInstance(project).showMergeDialog(Arrays.asList(files), new CvsMergeProvider()); } catch (Exception e1) { diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java index a2e055b7b283..a652289a59c7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java @@ -33,13 +33,8 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.roots.ProjectFileIndex; -import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.vcs.FilePath; -import com.intellij.openapi.vcs.FileStatus; -import com.intellij.openapi.vcs.ObjectsConvertor; -import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.actions.VcsContextFactory; import com.intellij.openapi.vcs.changes.*; import com.intellij.openapi.vcs.history.VcsRevisionNumber; @@ -63,13 +58,13 @@ public class CvsChangeProvider implements ChangeProvider { private final CvsVcs2 myVcs; private final CvsEntriesManager myEntriesManager; - private final ProjectFileIndex myFileIndex; + private final ProjectLevelVcsManager myVcsManager; private final ChangeListManager myChangeListManager; public CvsChangeProvider(final CvsVcs2 vcs, CvsEntriesManager entriesManager) { myVcs = vcs; myEntriesManager = entriesManager; - myFileIndex = ProjectRootManager.getInstance(vcs.getProject()).getFileIndex(); + myVcsManager = ProjectLevelVcsManager.getInstance(vcs.getProject()); myChangeListManager = ChangeListManager.getInstance(vcs.getProject()); } @@ -169,7 +164,7 @@ public class CvsChangeProvider implements ChangeProvider { for (VirtualFile file : children) { progress.checkCanceled(); if (file.isDirectory()) { - final boolean isIgnored = myFileIndex.isExcluded(file); + final boolean isIgnored = myVcsManager.isIgnored(file); if (!isIgnored) { processEntriesIn(file, scope, builder, true, progress); } @@ -284,7 +279,7 @@ public class CvsChangeProvider implements ChangeProvider { private void checkSwitchedDir(final VirtualFile dir, final ChangelistBuilder builder, final VcsDirtyScope scope) { final VirtualFile parentDir = dir.getParent(); - if (parentDir == null || !myFileIndex.isInContent(parentDir)) { + if (parentDir == null || !myVcsManager.isFileInContent(parentDir)) { return; } final CvsInfo info = myEntriesManager.getCvsInfoFor(dir); @@ -317,7 +312,7 @@ public class CvsChangeProvider implements ChangeProvider { private void checkSwitchedFile(final FilePath filePath, final ChangelistBuilder builder, final VirtualFile dir, final Entry entry) { // if content root itself is switched, ignore - if (!myFileIndex.isInContent(dir)) { + if (!myVcsManager.isFileInContent(dir)) { return; } final String dirTag = myEntriesManager.getCvsInfoFor(dir).getStickyTag(); diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java index 3877a78a0d35..eb30dd74752c 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java @@ -30,9 +30,8 @@ import com.intellij.openapi.fileChooser.FileElement; import com.intellij.openapi.fileChooser.FileSystemTree; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.roots.ProjectFileIndex; -import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.IconLoader; +import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -150,12 +149,11 @@ public class ImportTree extends NodeRenderer { if (myProject == null) { return; } - final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject).getFileIndex(); - if (!fileIndex.isExcluded(selectedFile)) { + if (!isIgnoredByVcs(selectedFile)) { return; } final VirtualFile parent = selectedFile.getParent(); - if (parent != null && fileIndex.isExcluded(parent)) { + if (parent != null && isIgnoredByVcs(parent)) { return; } for (final VirtualFile excludedFile : myExcludedFiles) { @@ -182,12 +180,11 @@ public class ImportTree extends NodeRenderer { if (myProject == null) { continue; } - final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject).getFileIndex(); - if (!fileIndex.isExcluded(selectedFile)) { + if (!isIgnoredByVcs(selectedFile)) { continue; } final VirtualFile parent = selectedFile.getParent(); - if (parent == null || fileIndex.isExcluded(parent) || myExcludedFiles.contains(parent)) { + if (parent == null || isIgnoredByVcs(parent) || myExcludedFiles.contains(parent)) { continue; } if (!myIncludedFiles.contains(selectedFile)) { @@ -211,7 +208,7 @@ public class ImportTree extends NodeRenderer { return true; } } - if (myProject == null || !ProjectRootManager.getInstance(myProject).getFileIndex().isExcluded(file)) { + if (myProject == null || !isIgnoredByVcs(file)) { return false; } for (VirtualFile includedFile : myIncludedFiles) { @@ -242,7 +239,7 @@ public class ImportTree extends NodeRenderer { if (FileTypeManager.getInstance().isFileIgnored(abstractFileObject.getName())) return true; if (myProject != null && !includedFiles.contains(file)) { final VirtualFile vFile = LocalFileSystem.getInstance().findFileByIoFile(file); - if (vFile != null && ProjectRootManager.getInstance(myProject).getFileIndex().isExcluded(vFile)) { + if (vFile != null && isIgnoredByVcs(vFile)) { return true; } } @@ -257,4 +254,8 @@ public class ImportTree extends NodeRenderer { } }; } + + private boolean isIgnoredByVcs(VirtualFile vFile) { + return myProject != null && ProjectLevelVcsManager.getInstance(myProject).isIgnored(vFile); + } } |