From 2a3f8797502af4c84156ffce3e6fd802d7b52c43 Mon Sep 17 00:00:00 2001
From: jphillips
Date: Fri, 27 Aug 2010 03:21:45 +0000
Subject: Fixed issue with transactions not showing up correctly in the branch
 manager

---
 .../ui/skynet/widgets/xBranch/XBranchContentProvider.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'plugins')

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);
-- 
cgit v1.2.3