← Back to branch summary

~bzr-eclipse/bzr-eclipse/trunk

« back to all changes in this revision

Viewing changes to org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/repository/RepositoriesView.java

  • Committer: Piotr Piastucki
  • Date: 2013-09-26 12:31:48 UTC
  • mfrom: (366.1.3 bzr-eclipse-pp)
  • Revision ID: piotr_piastucki-20130926123148-v182l4l2kfzkxqst
Merge lp:~piastucki/bzr-eclipse/branch-location-manager

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/repository/RepositoriesView.java
23
23
import org.eclipse.ui.navigator.CommonViewer;
24
24
import org.vcs.bazaar.eclipse.BzrWorkspaceRoot;
25
25
import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
26
 
import org.vcs.bazaar.eclipse.core.repository.BranchLocationManager;
27
26
import org.vcs.bazaar.eclipse.core.utils.ResourceUtil;
 
27
import org.vcs.bazaar.eclipse.ui.branch.BranchLocationManager;
28
28
import org.vcs.bazaar.eclipse.ui.repository.tree.RepositoryRootNode;
29
29
import org.vcs.bazaar.eclipse.ui.repository.tree.RepositoryTreeNode;
30
30
 
108
108
                        for (IProject project : projects) {
109
109
                                branches.add(BzrWorkspaceRoot.getBzrResourceFor(project).getBranch());
110
110
                        }
111
 
                        for (IBzrBranch branch : BranchLocationManager.getInstance().getAllBranches()) {
 
111
                        for (IBzrBranch branch : BranchLocationManager.getAllBranches()) {
112
112
                                if (branch != null && branch.isLocal()) {
113
113
                                        if (branch.exists()) {
114
114
                                                branches.add(branch);
115
 
                                        } else {
116
 
                                                BranchLocationManager.getInstance().removeRepoLocation(branch);
117
115
                                        }
118
116
                                }
119
117
                        }