diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
| commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/vcs-impl/src/com/intellij/openapi/vcs/changes/MapIgnoredFilesHolder.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
| download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/vcs-impl/src/com/intellij/openapi/vcs/changes/MapIgnoredFilesHolder.java')
| -rw-r--r-- | platform/vcs-impl/src/com/intellij/openapi/vcs/changes/MapIgnoredFilesHolder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/MapIgnoredFilesHolder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/MapIgnoredFilesHolder.java index 297e46482135..5ba7ce8cab0e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/MapIgnoredFilesHolder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/MapIgnoredFilesHolder.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.hash.HashSet; +import gnu.trove.THashSet; import java.util.Collection; import java.util.Set; @@ -40,8 +40,8 @@ public class MapIgnoredFilesHolder extends AbstractIgnoredFilesHolder { public MapIgnoredFilesHolder(Project project) { super(project); myProject = project; - mySet = new HashSet<VirtualFile>(); - myVcsIgnoredSet = new HashSet<VirtualFile>(); //collect ignored files from VcsChangeProvider -> processIgnored + mySet = new THashSet<VirtualFile>(); + myVcsIgnoredSet = new THashSet<VirtualFile>(); //collect ignored files from VcsChangeProvider -> processIgnored } @Override |