diff options
author | jphillips | 2010-08-26 20:09:40 +0000 |
---|---|---|
committer | jphillips | 2010-08-26 20:09:40 +0000 |
commit | 5d3e978a383ca8eaf719d648791dde7e5f280798 (patch) | |
tree | bbc51d7399feb17460b5fe5cf8656306ebb2898c /plugins | |
parent | f47d8a65cb16f9966461d7ab2c8aeec03216eee4 (diff) | |
download | org.eclipse.osee-5d3e978a383ca8eaf719d648791dde7e5f280798.tar.gz org.eclipse.osee-5d3e978a383ca8eaf719d648791dde7e5f280798.tar.xz org.eclipse.osee-5d3e978a383ca8eaf719d648791dde7e5f280798.zip |
Fixed issues with the branch manager
Diffstat (limited to 'plugins')
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); } |