Prepare Branch logic for server move.

2 files changed, 48 insertions, 33 deletions

diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
index fff975406f7..cf0ca2fe8fd 100644
--- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
+++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
@@ -122,26 +122,30 @@ public class BranchComboDialog extends TitleAreaDialog implements Listener {
             branchIds = new String[0];
          }
 
-         Branch branch = getSelection();
-         if (branch != null && branch.hasParentBranch()) {
-            String lastBranchSelected = Integer.toString(branch.getBranchId());
-
-            List<String> history = new ArrayList<String>(Arrays.asList(branchIds));
-            history.remove(lastBranchSelected);
-            history.add(0, lastBranchSelected);
-            if (history.size() > COMBO_HISTORY_LENGTH) {
-               history.remove(COMBO_HISTORY_LENGTH);
-            }
-            branchIds = new String[history.size()];
-            history.toArray(branchIds);
-
-            settings.put(TestRunStorageKey.BRANCH_IDS, branchIds);
-            settings.put(TestRunStorageKey.SELECTED_BRANCH_ID, lastBranchSelected);
-            try {
-               settings.save(this.getClass().getName());
-            } catch (IOException ex) {
-               OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);
+         try {
+            Branch branch = getSelection();
+            if (branch != null && branch.hasParentBranch()) {
+               String lastBranchSelected = Integer.toString(branch.getBranchId());
+
+               List<String> history = new ArrayList<String>(Arrays.asList(branchIds));
+               history.remove(lastBranchSelected);
+               history.add(0, lastBranchSelected);
+               if (history.size() > COMBO_HISTORY_LENGTH) {
+                  history.remove(COMBO_HISTORY_LENGTH);
+               }
+               branchIds = new String[history.size()];
+               history.toArray(branchIds);
+
+               settings.put(TestRunStorageKey.BRANCH_IDS, branchIds);
+               settings.put(TestRunStorageKey.SELECTED_BRANCH_ID, lastBranchSelected);
+               try {
+                  settings.save(this.getClass().getName());
+               } catch (IOException ex) {
+                  OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);
+               }
             }
+         } catch (OseeCoreException ex) {
+            OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);
          }
       }
    }
diff --git a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
index 371ac843691..b6b8b759301 100644
--- a/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
+++ b/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
@@ -32,6 +32,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.ViewerFilter;

+import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.logging.OseeLog;

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;

@@ -272,10 +273,16 @@ public class OutfileImportPage extends WizardDataTransferPage {
          setMessage(null);

          setErrorMessage("Please select a working branch. Cannot import into a null branch.");

          toReturn &= false;

-      } else if (!branch.hasParentBranch()) {

-         setMessage(null);

-         setErrorMessage("Please select a working branch. Cannot import into a top-level branch.");

-         toReturn &= false;

+      } else {

+         try {

+            if (!branch.hasParentBranch()) {

+               setMessage(null);

+               setErrorMessage("Please select a working branch. Cannot import into a top-level branch.");

+               toReturn &= false;

+            }

+         } catch (OseeCoreException ex) {

+            OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);

+         }

       }

       return toReturn;

    }

@@ -301,17 +308,21 @@ public class OutfileImportPage extends WizardDataTransferPage {
          }

 

          Branch branch = branchSelect.getData();

-         if (branch != null && branch.hasParentBranch()) {

-            String lastBranchSelected = Integer.toString(branch.getBranchId());

-            branchIds = addToHistory(branchIds, lastBranchSelected);

-

-            settings.put(TestRunStorageKey.BRANCH_IDS, branchIds);

-            settings.put(TestRunStorageKey.SELECTED_BRANCH_ID, lastBranchSelected);

-            try {

-               settings.save(this.getClass().getName());

-            } catch (IOException ex) {

-               OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);

+         try {

+            if (branch != null && branch.hasParentBranch()) {

+               String lastBranchSelected = Integer.toString(branch.getBranchId());

+               branchIds = addToHistory(branchIds, lastBranchSelected);

+

+               settings.put(TestRunStorageKey.BRANCH_IDS, branchIds);

+               settings.put(TestRunStorageKey.SELECTED_BRANCH_ID, lastBranchSelected);

+               try {

+                  settings.save(this.getClass().getName());

+               } catch (IOException ex) {

+                  OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);

+               }

             }

+         } catch (OseeCoreException ex) {

+            OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);

          }

       }

    }