[Mercurial] IDEA-55943 Using FilePath instead of VirtualFile, because the last one...
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 28 Jun 2010 07:46:04 +0000 (11:46 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 28 Jun 2010 07:46:04 +0000 (11:46 +0400)
plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationProvider.java

index bc86be6c8a41de90cb89c853c123611837731e91..b9803ea0a37788e654aba4dc9e482234e02732df 100644 (file)
@@ -28,24 +28,22 @@ public class HgAnnotationProvider implements AnnotationProvider {
 
   private static final int DEFAULT_LIMIT = 500;
 
-  private final Project project;
+  private final Project myProject;
 
   public HgAnnotationProvider(Project project) {
-    this.project = project;
+    this.myProject = project;
   }
 
   public FileAnnotation annotate(VirtualFile file) throws VcsException {
-    VirtualFile vcsRoot = VcsUtil.getVcsRootFor(project, file);
+    final VirtualFile vcsRoot = VcsUtil.getVcsRootFor(myProject, VcsUtil.getFilePath(file.getPath()));
     if (vcsRoot == null) {
       throw new VcsException("vcs root is null");
     }
-    HgFile hgFile = new HgFile(vcsRoot, VfsUtil.virtualToIoFile(file));
-    HgAnnotateCommand hgAnnotateCommand = new HgAnnotateCommand(project);
-    HgLogCommand hgLogCommand = new HgLogCommand(project);
+    final HgFile hgFile = new HgFile(vcsRoot, VfsUtil.virtualToIoFile(file));
     return new HgAnnotation(
       hgFile,
-      hgAnnotateCommand.execute(hgFile),
-      hgLogCommand.execute(hgFile, DEFAULT_LIMIT, false)
+      (new HgAnnotateCommand(myProject)).execute(hgFile),
+      (new HgLogCommand(myProject)).execute(hgFile, DEFAULT_LIMIT, false)
     );
   }