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

[hg] cosmetics, NotNull

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-10-06 16:33:03 +04:00
parent 3040158597
commit a8c603696a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
+4 -6
View File
@@ -84,12 +84,10 @@ public class HgVFSListener extends VcsVFSListener {
it.remove();
}
}
// exlude files which are additional ignored from .hgignore and execute adding
final Map<VirtualFile, Collection<VirtualFile>> sortedFiles;
sortedFiles = HgUtil.sortByHgRoots(myProject, addedFiles);
// exclude files which are ignored in .hgignore in background and execute adding after that
final Map<VirtualFile, Collection<VirtualFile>> sortedFiles = HgUtil.sortByHgRoots(myProject, addedFiles);
final HashSet<VirtualFile> untrackedFiles = new HashSet<VirtualFile>();
final ProgressManager progressManager = ProgressManager.getInstance();
progressManager.run(new Task.Backgroundable(myProject, HgVcsMessages.message("hg4idea.progress.checking.ignored"), false) {
new Task.Backgroundable(myProject, HgVcsMessages.message("hg4idea.progress.checking.ignored"), false) {
@Override
public void run(@NotNull ProgressIndicator pi) {
for (Map.Entry<VirtualFile, Collection<VirtualFile>> e : sortedFiles.entrySet()) {
@@ -119,7 +117,7 @@ public class HgVFSListener extends VcsVFSListener {
});
}
}
});
}.queue();
}
/**
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
+4 -3
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.vcs.ObjectsConvertor;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.vcsUtil.VcsFileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.zmlx.hg4idea.HgChange;
import org.zmlx.hg4idea.HgFile;
@@ -192,11 +193,11 @@ public class HgStatusCommand {
includeUnknown = true;
}
public Collection<VirtualFile> getHgUntrackedFiles(VirtualFile repo, List<VirtualFile> files) throws VcsException {
@NotNull
public Collection<VirtualFile> getHgUntrackedFiles(@NotNull VirtualFile repo, @NotNull List<VirtualFile> files) throws VcsException {
Collection<VirtualFile> untrackedFiles = new HashSet<VirtualFile>();
setOnlyUntrackedTrue();
List<FilePath> filePaths;
filePaths = ObjectsConvertor.vf2fp(files);
List<FilePath> filePaths = ObjectsConvertor.vf2fp(files);
Set<HgChange> change = execute(repo, filePaths);
for (HgChange hgChange : change) {
untrackedFiles.add(hgChange.afterFile().toFilePath().getVirtualFile());