diff options
| author | ddunne | 2009-04-06 03:26:24 +0000 |
|---|---|---|
| committer | ddunne | 2009-04-06 03:26:24 +0000 |
| commit | b03c2fae274e8c998d04cf98bf0de00e0db3d2f7 (patch) | |
| tree | e9a3b3be9533afb0e7cadff4d96a3805f3bcc983 /org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java | |
| parent | 170c3aa3638b60caf001fa6ba1ba2e615543090d (diff) | |
| download | org.eclipse.osee-b03c2fae274e8c998d04cf98bf0de00e0db3d2f7.tar.gz org.eclipse.osee-b03c2fae274e8c998d04cf98bf0de00e0db3d2f7.tar.xz org.eclipse.osee-b03c2fae274e8c998d04cf98bf0de00e0db3d2f7.zip | |
Diffstat (limited to 'org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java')
| -rw-r--r-- | org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java index a064d02b396..94ed0979d81 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java @@ -350,30 +350,13 @@ public class AtsBranchManager { if (smaMgr.isTeamUsesVersions()) {
VersionArtifact verArt = smaMgr.getTargetedForVersion();
if (verArt != null) {
- try {
- Integer branchId =
- verArt.getSoleAttributeValue(ATSAttributes.PARENT_BRANCH_ID_ATTRIBUTE.getStoreName(), 0);
- if (branchId != null && branchId > 0) {
- parentBranch = BranchManager.getBranch(branchId);
- }
- } catch (BranchDoesNotExist ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
- }
+ parentBranch = verArt.getParentBranch();
}
}
// If not defined in version, check for parent branch from team definition
if (parentBranch == null && (smaMgr.getSma() instanceof TeamWorkFlowArtifact)) {
- try {
- Integer branchId =
- ((TeamWorkFlowArtifact) smaMgr.getSma()).getTeamDefinition().getSoleAttributeValue(
- ATSAttributes.PARENT_BRANCH_ID_ATTRIBUTE.getStoreName());
- if (branchId != null && branchId > 0) {
- parentBranch = BranchManager.getBranch(branchId);
- }
- } catch (OseeCoreException ex) {
- // do nothing
- }
+ parentBranch = ((TeamWorkFlowArtifact) smaMgr.getSma()).getTeamDefinition().getParentBranch();
}
// If not defined, return null
|