feature[ats_ZQZZF]: Change identity service to return longs for local ids

Change-Id: I1f0d06787affd6582551254ec6170785f5c56fe7

3 files changed, 4 insertions, 4 deletions

diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
index ce4b582a100..6fbae37190a 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/dialogs/BranchComboDialog.java
@@ -126,7 +126,7 @@ public class BranchComboDialog extends TitleAreaDialog implements Listener {
          try {
             Branch branch = getSelection();
             if (branch != null && branch.hasParentBranch()) {
-               String lastBranchSelected = Integer.toString(branch.getId());
+               String lastBranchSelected = Long.toString(branch.getId());
 
                List<String> history = new ArrayList<String>(Arrays.asList(branchIds));
                history.remove(lastBranchSelected);
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
index 3c4ce42ffd9..504589ea3eb 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/importer/OutfileImportPage.java
@@ -219,7 +219,7 @@ public class OutfileImportPage extends WizardDataTransferPage {
       if (settings != null) {
          String lastSelected = settings.get(TestRunStorageKey.SELECTED_BRANCH_ID);
          try {
-            branchSelect.setSelection(BranchManager.getBranch(Integer.parseInt(lastSelected)));
+            branchSelect.setSelection(BranchManager.getBranch(Long.parseLong(lastSelected)));
          } catch (Exception ex) {
             OseeLog.log(OteUiDefinePlugin.class, Level.SEVERE, ex);
          }
@@ -306,7 +306,7 @@ public class OutfileImportPage extends WizardDataTransferPage {
          IOseeBranch branch = branchSelect.getData();
          try {
             if (branch != null && BranchManager.getBranch(branch).hasParentBranch()) {
-               String lastBranchSelected = Integer.toString(BranchManager.getBranchId(branch));
+               String lastBranchSelected = Long.toString(BranchManager.getBranchId(branch));
                branchIds = addToHistory(branchIds, lastBranchSelected);
 
                settings.put(TestRunStorageKey.BRANCH_IDS, branchIds);
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java
index 9048140709f..64941126886 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/views/TestRunArtifactOptions.java
@@ -48,7 +48,7 @@ public class TestRunArtifactOptions implements IPropertyStoreBasedControl {
       propertyStore.put(TestRunStorageKey.BRANCH_IDS, this.panel.getBranchIds());
 
       Branch branch = this.panel.getSelectedBranch();
-      int branchId = -1;
+      long branchId = -1;
       if (branch != null) {
          branchId = branch.getId();
       }