diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java index dfc69947a51b..a855400c309b 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java @@ -300,7 +300,7 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable { ProjectRootManager rootManager = ProjectRootManager.getInstance(project); boolean projectIgnored = rootManager.getFileIndex().isIgnored(file); - if (!projectIgnored && !FileTypeManager.getInstance().isFileIgnored(file.getName())) { + if (!projectIgnored && !FileTypeManager.getInstance().isFileIgnored(file)) { ImageFileTypeManager typeManager = ImageFileTypeManager.getInstance(); if (file.isDirectory()) { if (thumbnailView.isRecursive()) { diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkSourcepath.java b/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkSourcepath.java index 2c76877d43ec..a0922e3eaeff 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkSourcepath.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkSourcepath.java @@ -141,7 +141,7 @@ public class ModuleChunkSourcepath extends CompositeGenerator{ } private void addExcludePatterns(Module module, final VirtualFile root, VirtualFile dir, CompositeGenerator generator, final boolean parentIncluded) { - if (FileTypeManager.getInstance().isFileIgnored(dir.getName())) { + if (FileTypeManager.getInstance().isFileIgnored(dir)) { // ignored files are handled by global 'ignored' patternset return; } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java b/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java index 14ce3fe14192..3c89b1273640 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java @@ -939,7 +939,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent { final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); new Object() { void processFile(VirtualFile file) { - if (fileTypeManager.isFileIgnored(file.getName())) { + if (fileTypeManager.isFileIgnored(file)) { return; } final int fileId = getFileId(file); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalCompilerInstructionCreatorBase.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalCompilerInstructionCreatorBase.java index 6ecdf472bdc2..fff58ede73d9 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalCompilerInstructionCreatorBase.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/IncrementalCompilerInstructionCreatorBase.java @@ -56,7 +56,7 @@ public abstract class IncrementalCompilerInstructionCreatorBase implements Incre if (children != null) { for (VirtualFile child : children) { if (copyExcluded) { - if (fileTypeManager.isFileIgnored(child.getName())) continue; + if (fileTypeManager.isFileIgnored(child)) continue; } else { if (index.isIgnored(child)) continue; diff --git a/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java b/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java index a748eee85477..3962e4f3b739 100644 --- a/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java +++ b/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java @@ -66,7 +66,7 @@ public class JavaUtilForVfs { } FileTypeManager typeManager = FileTypeManager.getInstance(); final String dirName = dir.getName(); - if (typeManager.isFileIgnored(dirName) || StringUtil.startsWithIgnoreCase(dirName, "testdata")) { + if (typeManager.isFileIgnored(dir) || StringUtil.startsWithIgnoreCase(dirName, "testdata")) { return; } final ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator(); diff --git a/java/java-impl/src/com/intellij/ide/util/treeView/TreeViewUtil.java b/java/java-impl/src/com/intellij/ide/util/treeView/TreeViewUtil.java index e9d20641e286..e7a8cdabcfe9 100644 --- a/java/java-impl/src/com/intellij/ide/util/treeView/TreeViewUtil.java +++ b/java/java-impl/src/com/intellij/ide/util/treeView/TreeViewUtil.java @@ -89,7 +89,7 @@ public class TreeViewUtil { int subpackagesCount = 0; int directoriesCount = 0; for (VirtualFile file : files) { - if (FileTypeManager.getInstance().isFileIgnored(file.getName())) continue; + if (FileTypeManager.getInstance().isFileIgnored(file)) continue; if (!file.isDirectory()) return false; PsiDirectory childDir = manager.findDirectory(file); if (childDir != null) { diff --git a/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java b/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java index b14dfa8d8744..692e9c0c520e 100644 --- a/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java +++ b/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java @@ -32,7 +32,7 @@ public class FileIndexUtil { FileTypeManager fileTypeManager = FileTypeManager.getInstance(); if (file.isDirectory()) return false; if (fileTypeManager.getFileTypeByFile(file) != StdFileTypes.JAVA) return false; - if (fileTypeManager.isFileIgnored(file.getName())) return false; + if (fileTypeManager.isFileIgnored(file)) return false; return ProjectRootManager.getInstance(project).getFileIndex().isInSource(file); } } diff --git a/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java b/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java index 95891abbb0a6..16ea8ca144e5 100644 --- a/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java +++ b/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java @@ -218,7 +218,7 @@ public class CommonRefactoringUtil { final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); if (children != null) { for (VirtualFile virtualFile : children) { - if (fileTypeManager.isFileIgnored(virtualFile.getName())) continue; + if (fileTypeManager.isFileIgnored(virtualFile)) continue; addVirtualFiles(virtualFile, list); } } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java index 0f8b51a745ce..8d681e621ba4 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java @@ -435,7 +435,7 @@ public class FindInProjectUtil { final VirtualFileFilter contentFilter = new VirtualFileFilter() { public boolean accept(final VirtualFile file) { if (file.isDirectory()) return true; - if (fileTypeManager.isFileIgnored(file.getName()) || fileTypeManager.getFileTypeByFile(file).isBinary()) return false; + if (fileTypeManager.isFileIgnored(file) || fileTypeManager.getFileTypeByFile(file).isBinary()) return false; return searchScope.contains(file); } }; diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java index ab10e02f5bc3..cf4fa71ff971 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java @@ -338,7 +338,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Expo LOG.debug("FileTemplateManagerImpl.loadTemplates() reading default templates..."); // Read default templates for (VirtualFile file : defaultTemplates) { - if(FileTypeManagerEx.getInstance().isFileIgnored(file.getName())) continue; + if(FileTypeManagerEx.getInstance().isFileIgnored(file)) continue; String name = file.getName(); //name.extension.ft , e.g. "NewClass.java.ft" @NonNls String extension = myTypeManager.getExtension(name); name = name.substring(0, name.length() - extension.length() - 1); //name="NewClass.java" extension="ft" 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 f9fca27b6709..f74e28777500 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java @@ -257,7 +257,7 @@ public class DeleteHandler { * Fills readOnlyFiles with VirtualFiles */ private static void getReadOnlyVirtualFiles(VirtualFile file, ArrayList readOnlyFiles, final FileTypeManager ftManager) { - if (ftManager.isFileIgnored(file.getName())) return; + if (ftManager.isFileIgnored(file)) return; if (!file.isWritable()) { readOnlyFiles.add(file); } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java index e473de7ab3b9..a5aef1f3d0d3 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java @@ -199,7 +199,7 @@ public class DirectoryIndexImpl extends DirectoryIndex implements ProjectCompone } private static boolean isIgnored(@NotNull VirtualFile f) { - return FileTypeManager.getInstance().isFileIgnored(f.getName()); + return FileTypeManager.getInstance().isFileIgnored(f); } public DirectoryInfo getInfoForDirectory(VirtualFile dir) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java index f57450236da0..9abfc41cef08 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java @@ -68,7 +68,7 @@ public class ModuleFileIndexImpl implements ModuleFileIndex { public boolean isContentJavaSourceFile(@NotNull VirtualFile file) { return !file.isDirectory() && myFileTypeManager.getFileTypeByFile(file) == StdFileTypes.JAVA - && !myFileTypeManager.isFileIgnored(file.getName()) + && !myFileTypeManager.isFileIgnored(file) && isInSourceContent(file); } @@ -153,7 +153,7 @@ public class ModuleFileIndexImpl implements ModuleFileIndex { return info != null && myModule.equals(info.module); } else { - return !myFileTypeManager.isFileIgnored(file.getName()); + return !myFileTypeManager.isFileIgnored(file); } } } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java index 3df27313d533..21a908dc061b 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java @@ -16,14 +16,12 @@ package com.intellij.openapi.roots.impl; -import com.intellij.ide.startup.StartupManagerEx; import com.intellij.injected.editor.VirtualFileWindow; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ContentIterator; import com.intellij.openapi.roots.ModuleRootManager; @@ -89,7 +87,7 @@ public class ProjectFileIndexImpl implements ProjectFileIndex { } public boolean isIgnored(@NotNull VirtualFile file) { - if (myFileTypeManager.isFileIgnored(file.getName())) return true; + if (myFileTypeManager.isFileIgnored(file)) return true; VirtualFile dir = file.isDirectory() ? file : file.getParent(); if (dir == null) return false; @@ -157,14 +155,14 @@ public class ProjectFileIndexImpl implements ProjectFileIndex { public boolean isContentJavaSourceFile(@NotNull VirtualFile file) { if (file.isDirectory()) return false; if (myFileTypeManager.getFileTypeByFile(file) != StdFileTypes.JAVA) return false; - if (myFileTypeManager.isFileIgnored(file.getName())) return false; + if (myFileTypeManager.isFileIgnored(file)) return false; return isInSourceContent(file); } public boolean isLibraryClassFile(@NotNull VirtualFile file) { if (file.isDirectory()) return false; if (myFileTypeManager.getFileTypeByFile(file) != StdFileTypes.CLASS) return false; - if (myFileTypeManager.isFileIgnored(file.getName())) return false; + if (myFileTypeManager.isFileIgnored(file)) return false; VirtualFile parent = file.getParent(); DirectoryInfo parentInfo = getInfoForDirectory(parent); return parentInfo != null && parentInfo.libraryClassRoot != null; @@ -244,7 +242,7 @@ public class ProjectFileIndexImpl implements ProjectFileIndex { return info != null && info.module != null; } else { - return !myFileTypeManager.isFileIgnored(file.getName()); + return !myFileTypeManager.isFileIgnored(file); } } } diff --git a/platform/lang-impl/src/com/intellij/psi/SingleRootFileViewProvider.java b/platform/lang-impl/src/com/intellij/psi/SingleRootFileViewProvider.java index 89a00b045a08..4173eb3ce3ac 100644 --- a/platform/lang-impl/src/com/intellij/psi/SingleRootFileViewProvider.java +++ b/platform/lang-impl/src/com/intellij/psi/SingleRootFileViewProvider.java @@ -234,8 +234,7 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi protected boolean isIgnored() { final VirtualFile file = getVirtualFile(); if (file instanceof LightVirtualFile) return false; - final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); - return fileTypeManager.isFileIgnored(file.getName()); + return FileTypeManager.getInstance().isFileIgnored(file); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/psi/impl/CheckUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/CheckUtil.java index 88752540340d..945b4b1ddccb 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/CheckUtil.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/CheckUtil.java @@ -47,7 +47,7 @@ public class CheckUtil { } public static void checkDelete(VirtualFile file) throws IncorrectOperationException{ - if (FileTypeManager.getInstance().isFileIgnored(file.getName())) return; + if (FileTypeManager.getInstance().isFileIgnored(file)) return; if (!file.isWritable()) { throw new IncorrectOperationException(PsiBundle.message("cannot.delete.a.read.only.file", file.getPresentableUrl())); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java index 66beef533b34..df39dacb7204 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java @@ -878,7 +878,7 @@ public class FileManagerImpl implements FileManager { if (vFile.isDirectory()) { PsiDirectory psiDir = myVFileToPsiDirMap.get(vFile); if (psiDir != null) { - if (myFileTypeManager.isFileIgnored(vFile.getName())) { + if (myFileTypeManager.isFileIgnored(vFile)) { removeFilesAndDirsRecursively(vFile); treeEvent.setChild(psiDir); @@ -957,7 +957,7 @@ public class FileManagerImpl implements FileManager { final PsiDirectory oldParentDir = findDirectory(event.getOldParent()); final PsiDirectory newParentDir = findDirectory(event.getNewParent()); if (oldParentDir == null && newParentDir == null) return; - if (myFileTypeManager.isFileIgnored(vFile.getName())) return; + if (myFileTypeManager.isFileIgnored(vFile)) return; ApplicationManager.getApplication().runWriteAction( new ExternalChangeAction() { diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java index ad5e603357b1..42f9d9367091 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java @@ -73,7 +73,7 @@ public class FileBasedIndexProjectHandler extends AbstractProjectComponent imple public boolean isInSet(final VirtualFile file) { final ProjectFileIndex index = myRootManager.getFileIndex(); if (index.isInContent(file) || index.isInLibraryClasses(file) || index.isInLibrarySource(file)) { - return !myFileTypeManager.isFileIgnored(file.getName()); + return !myFileTypeManager.isFileIgnored(file); } return false; } diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java index 7d3d2e5a46b7..ae7a553e2e22 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java @@ -68,7 +68,7 @@ public class IdeaGateway { if (ProjectRootManager.getInstance(each).getFileIndex().isIgnored(f)) return false; } - return !FileTypeManager.getInstance().isFileIgnored(fileName); + return !FileTypeManager.getInstance().isFileIgnored(f); } public boolean areContentChangesVersioned(VirtualFile f) { diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java index 926524b538ec..5cdede04c27a 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java +++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java @@ -141,7 +141,7 @@ public class FileChooserDescriptor implements Cloneable{ } // do not include ignored files - if (isHideIgnored() && FileTypeManager.getInstance().isFileIgnored(file.getName())) { + if (isHideIgnored() && FileTypeManager.getInstance().isFileIgnored(file)) { return false; } diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeManager.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeManager.java index 4cfca45f9a4d..71896c49bc52 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeManager.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeManager.java @@ -110,6 +110,8 @@ public abstract class FileTypeManager{ public abstract boolean isFileIgnored(@NonNls @NotNull String name); + public abstract boolean isFileIgnored(@NonNls @NotNull VirtualFile file); + /** * Returns the list of extensions associated with the specified file type. * diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/MockFileTypeManager.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/MockFileTypeManager.java index 5605c68d3d0f..0abd61260a9f 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/MockFileTypeManager.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/MockFileTypeManager.java @@ -62,6 +62,11 @@ class MockFileTypeManager extends FileTypeManager { return false; } + @Override + public boolean isFileIgnored(@NonNls @NotNull VirtualFile file) { + return false; + } + @NotNull @Override public String[] getAssociatedExtensions(@NotNull FileType type) { diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java index 7609188eb1ad..20f51b8f8553 100644 --- a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java @@ -696,7 +696,7 @@ public class VfsUtil { final FileTypeManager ftm = FileTypeManager.getInstance(); processFilesRecursively(root, processor, new Convertor() { public Boolean convert(final VirtualFile vf) { - return ! ftm.isFileIgnored(vf.getName()); + return ! ftm.isFileIgnored(vf); } }); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/PruneEmptyDirectoriesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/PruneEmptyDirectoriesAction.java index 824205cc3f9b..e400f63ff3f5 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/PruneEmptyDirectoriesAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/PruneEmptyDirectoriesAction.java @@ -54,7 +54,7 @@ public class PruneEmptyDirectoriesAction extends AnAction { private static void pruneEmptiesIn(final VirtualFile file, FileTypeManager ftManager) throws IOException { if (file.isDirectory()) { - if (ftManager.isFileIgnored(file.getName())) return; + if (ftManager.isFileIgnored(file)) return; for (VirtualFile child : file.getChildren()) { pruneEmptiesIn(child, ftManager); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index d5d56795c9e6..d4f77328d51e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -411,6 +411,11 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME return false; } + @Override + public boolean isFileIgnored(@NonNls @NotNull VirtualFile file) { + return isFileIgnored(file.getName()); + } + @SuppressWarnings({"deprecation"}) @NotNull public String[] getAssociatedExtensions(@NotNull FileType type) { 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 ea77b37ab48b..5a9eeda025e7 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 @@ -466,7 +466,7 @@ public class CvsChangeProvider implements ChangeProvider { } private static boolean isInContent(VirtualFile file) { - return file == null || !FileTypeManager.getInstance().isFileIgnored(file.getName()); + return file == null || !FileTypeManager.getInstance().isFileIgnored(file); } private static DirectoryContent getDirectoryContent(VirtualFile directory, final Runnable checkCanceled) { diff --git a/samples/vfs/src/myVFS/VfsSamplePlugin.java b/samples/vfs/src/myVFS/VfsSamplePlugin.java index 6e3b8fa550fd..40a563d23d89 100644 --- a/samples/vfs/src/myVFS/VfsSamplePlugin.java +++ b/samples/vfs/src/myVFS/VfsSamplePlugin.java @@ -69,7 +69,7 @@ public class VfsSamplePlugin implements ProjectComponent { private static boolean updateCount(VirtualFile file, int increase) { FileTypeManager fileTypeManager = FileTypeManager.getInstance(); - if (!fileTypeManager.isFileIgnored(file.getName()) + if (!fileTypeManager.isFileIgnored(file) && fileTypeManager.getFileTypeByFile(file) == StdFileTypes.JAVA) { ourJavaFilesCount += increase; return true;