diff options
author | jphillips | 2010-08-27 03:21:45 +0000 |
---|---|---|
committer | jphillips | 2010-08-27 03:21:45 +0000 |
commit | 2a3f8797502af4c84156ffce3e6fd802d7b52c43 (patch) | |
tree | 8ecd2b9f6c4dd515930829eea85532fbe02a7e48 /plugins | |
parent | 57f563dffe3becedfadb8eb381ee0a68e16535b6 (diff) | |
download | org.eclipse.osee-2a3f8797502af4c84156ffce3e6fd802d7b52c43.tar.gz org.eclipse.osee-2a3f8797502af4c84156ffce3e6fd802d7b52c43.tar.xz org.eclipse.osee-2a3f8797502af4c84156ffce3e6fd802d7b52c43.zip |
Fixed issue with transactions not showing up correctly in the branch manager
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java | 12 |
1 files changed, 7 insertions, 5 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 aeca280cec1..b59af9e10af 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 @@ -179,11 +179,13 @@ public class XBranchContentProvider implements ITreeContentProvider { if (element instanceof Branch) { boolean hasChildren = true; try { - if (!showChildBranchesAtMainLevel) { - hasChildren = - showArchivedBranches ? !((Branch) element).getChildBranches(true).isEmpty() : !((Branch) element).getChildBranches().isEmpty(); - } else { - hasChildren = false; + if (!showTransactions) { + if (!showChildBranchesAtMainLevel) { + hasChildren = + showArchivedBranches ? !((Branch) element).getChildBranches(true).isEmpty() : !((Branch) element).getChildBranches().isEmpty(); + } else { + hasChildren = false; + } } } catch (OseeCoreException ex) { OseeLog.log(this.getClass(), Level.WARNING, ex); |