diff options
| author | jmisinco | 2011-07-18 22:47:49 +0000 |
|---|---|---|
| committer | Ryan D. Brooks | 2011-07-18 22:47:49 +0000 |
| commit | a5908e7fcb3111138f2cc6621f9598f053094005 (patch) | |
| tree | ffa3a5e3dc9d3e4b135b073d9c5816825d2bb27a /plugins/org.eclipse.osee.framework.ui.skynet | |
| parent | 8a647b7e25435ddf1fadfe9cdef1f3375f96d010 (diff) | |
| download | org.eclipse.osee-a5908e7fcb3111138f2cc6621f9598f053094005.tar.gz org.eclipse.osee-a5908e7fcb3111138f2cc6621f9598f053094005.tar.xz org.eclipse.osee-a5908e7fcb3111138f2cc6621f9598f053094005.zip | |
bug: XBranchWidget displays duplicate branches when only showing working branches0.9.8.v201107191026_SR3_RC
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet')
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java index 01bfa09179e..070cbc7b3d5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java @@ -14,8 +14,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Set; import java.util.logging.Level; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -113,7 +115,7 @@ public class XBranchContentProvider implements ITreeContentProvider { branchTypes.add(BranchType.WORKING); } - List<Branch> branchesToReturn = new ArrayList<Branch>(); + Set<Branch> branchesToReturn = new HashSet<Branch>(); if (showOnlyWorkingBranches) { branchesToReturn.addAll(BranchManager.getBranches(BranchArchivedState.UNARCHIVED, BranchType.WORKING)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java index 7ec31aae26d..9ae425ba40b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java @@ -98,8 +98,8 @@ public class XBranchWidget extends GenericXWidget { break; } } - refresh(); } + refresh(); } public void reveal(Branch branch) { |