Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2014-04-01 03:36:26 +0000
committerDonald Dunne2014-04-10 18:39:40 +0000
commit164fd76d747181a677dd513683f269a7fe2ea998 (patch)
treedc459aa630a2339502f7644d0c9cc7f154941198 /plugins/org.eclipse.osee.framework.branch.gantt
parentcfb904d9e09ae1303d999e79a970870ed02ed565 (diff)
downloadorg.eclipse.osee-164fd76d747181a677dd513683f269a7fe2ea998.tar.gz
org.eclipse.osee-164fd76d747181a677dd513683f269a7fe2ea998.tar.xz
org.eclipse.osee-164fd76d747181a677dd513683f269a7fe2ea998.zip
feature[ats_ATS19845]: Rename branchGuid to branchUuid
Diffstat (limited to 'plugins/org.eclipse.osee.framework.branch.gantt')
-rw-r--r--plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java17
1 files changed, 11 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java b/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java
index 248762e7e8c..7cb92b40021 100644
--- a/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java
+++ b/plugins/org.eclipse.osee.framework.branch.gantt/src/org/eclipse/osee/branch/gantt/views/BranchVisualizationView.java
@@ -102,7 +102,7 @@ public class BranchVisualizationView extends ViewPart {
IOseeBranch selectedBranch = xBranchSelectWidget.getData();
if (selectedBranch != null) {
try {
- UserManager.getUser().setSetting(BRANCH_KEY, selectedBranch.getGuid());
+ UserManager.getUser().setSetting(BRANCH_KEY, selectedBranch.getUuid());
UserManager.getUser().persist("Store Branch Visualization Default Branch");
} catch (OseeCoreException ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
@@ -129,11 +129,16 @@ public class BranchVisualizationView extends ViewPart {
private void loadLastSelectedBranch() {
try {
- String branchGuid = UserManager.getUser().getSetting(BRANCH_KEY);
- if (Strings.isValid(branchGuid)) {
- Branch branch = BranchManager.getBranchByGuid(branchGuid);
- if (branch != null) {
- xBranchSelectWidget.setSelection(branch);
+ String branchUuid = UserManager.getUser().getSetting(BRANCH_KEY);
+ if (Strings.isValid(branchUuid)) {
+ try {
+ Long uuid = Long.valueOf(branchUuid);
+ Branch branch = BranchManager.getBranchByUuid(uuid);
+ if (branch != null) {
+ xBranchSelectWidget.setSelection(branch);
+ }
+ } catch (Exception ex) {
+ // do nothing
}
}
} catch (OseeCoreException ex) {

Back to the top