Fixed issues with the branch manager

2 files changed, 14 insertions, 16 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 b193352eae0..aeca280cec1 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
@@ -178,18 +178,15 @@ public class XBranchContentProvider implements ITreeContentProvider {
       }
       if (element instanceof Branch) {
          boolean hasChildren = true;
-
-         if (!showTransactions) {
-            try {
-               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);
+         try {
+            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);
          }
          return hasChildren;
       }
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 f9e3b107252..e3f06d27fc1 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
@@ -172,6 +172,11 @@ public class XBranchWidget extends XWidget implements IActionable {
       item.addSelectionListener(new SelectionAdapter() {
          @Override
          public void widgetSelected(SelectionEvent e) {
+            try {
+               BranchManager.refreshBranches();
+            } catch (OseeCoreException ex) {
+               OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+            }
             loadData();
          }
       });
@@ -240,6 +245,7 @@ public class XBranchWidget extends XWidget implements IActionable {
 
    @Override
    public void refresh() {
+      loadData();
       branchXViewer.refresh();
       validate();
    }
@@ -290,11 +296,6 @@ public class XBranchWidget extends XWidget implements IActionable {
                      extraInfoLabel.setText("");
                   }
                   if (branchXViewer != null) {
-                     try {
-                        BranchManager.refreshBranches();
-                     } catch (OseeCoreException ex) {
-                        OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
-                     }
                      branchXViewer.setInput(input);
                      getXViewer().setExpandedElements(expandedBranches);
                   }