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

GitBranchesCollection: use Collection instead of Set

Browse Source
This commit is contained in:
Kirill Likhodedov
2011-11-24 17:19:38 +03:00
parent 531f15011f
commit 538738f99c
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/branch/GitBranchesCollection.java
+8 -7
View File
@@ -19,8 +19,9 @@ import git4idea.GitBranch;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
/**
* <p>
@@ -35,13 +36,13 @@ import java.util.Set;
*/
public final class GitBranchesCollection {
public static final GitBranchesCollection EMPTY = new GitBranchesCollection(null, new HashSet<GitBranch>(), new HashSet<GitBranch>());
public static final GitBranchesCollection EMPTY = new GitBranchesCollection(null, Collections.<GitBranch>emptyList(), Collections.<GitBranch>emptyList());
private final Set<GitBranch> myLocalBranches;
private final Set<GitBranch> myRemoteBranches;
private final Collection<GitBranch> myLocalBranches;
private final Collection<GitBranch> myRemoteBranches;
private final GitBranch myCurrentBranch;
public GitBranchesCollection(@Nullable GitBranch currentBranch, @NotNull Set<GitBranch> localBranches, @NotNull Set<GitBranch> remoteBranches) {
public GitBranchesCollection(@Nullable GitBranch currentBranch, @NotNull Collection<GitBranch> localBranches, @NotNull Collection<GitBranch> remoteBranches) {
myCurrentBranch = currentBranch;
myRemoteBranches = remoteBranches;
myLocalBranches = localBranches;
@@ -58,7 +59,7 @@ public final class GitBranchesCollection {
* @return the copy of local branches set.
*/
@NotNull
public Set<GitBranch> getLocalBranches() {
public Collection<GitBranch> getLocalBranches() {
return new HashSet<GitBranch>(myLocalBranches);
}
@@ -66,7 +67,7 @@ public final class GitBranchesCollection {
* @return the copy of remote branches set.
*/
@NotNull
public Set<GitBranch> getRemoteBranches() {
public Collection<GitBranch> getRemoteBranches() {
return new HashSet<GitBranch>(myRemoteBranches);
}
plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java
+2 -2
View File
@@ -117,11 +117,11 @@ public class LowLevelAccessImpl implements LowLevelAccess {
final GitRepository repositoryForRoot = GitRepositoryManager.getInstance(myProject).getRepositoryForRoot(myRoot);
if (repositoryForRoot != null) {
final GitBranchesCollection branches = repositoryForRoot.getBranches();
final Set<GitBranch> localBranches = branches.getLocalBranches();
final Collection<GitBranch> localBranches = branches.getLocalBranches();
for (GitBranch localBranch : localBranches) {
refs.addLocal(localBranch.getName());
}
final Set<GitBranch> remoteBranches = branches.getRemoteBranches();
final Collection<GitBranch> remoteBranches = branches.getRemoteBranches();
for (GitBranch remoteBranch : remoteBranches) {
String name = remoteBranch.getName();
name = name.startsWith("remotes/") ? name.substring("remotes/".length()) : name;