diff options
| author | Angel Avila | 2013-09-04 19:23:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-09-19 20:03:15 +0000 |
| commit | cba5f1573967f78933c7f77f55b3209b0ae130c4 (patch) | |
| tree | dbcc804a1db76512f5924a2110ab5509b085bea7 /plugins/org.eclipse.osee.ats.core.client | |
| parent | 58684e9a972496a9ceec69908820194d826a807e (diff) | |
| download | org.eclipse.osee-cba5f1573967f78933c7f77f55b3209b0ae130c4.tar.gz org.eclipse.osee-cba5f1573967f78933c7f77f55b3209b0ae130c4.tar.xz org.eclipse.osee-cba5f1573967f78933c7f77f55b3209b0ae130c4.zip | |
bug[ats_12LYT]: Make Merge Manager UI consistent
Change-Id: I725413ae9732066acf0bf18e85b9347f43c81d91
Diffstat (limited to 'plugins/org.eclipse.osee.ats.core.client')
2 files changed, 10 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java index f2921e379ed..79879ec3095 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/AtsBranchManagerCore.java @@ -182,6 +182,13 @@ public class AtsBranchManagerCore { } public static CommitStatus getCommitStatus(TeamWorkFlowArtifact teamArt, Branch destinationBranch, ICommitConfigArtifact configArt) throws OseeCoreException { + Branch workingBranch = teamArt.getWorkingBranch(); + if (workingBranch != null) { + if (workingBranch.getBranchState().isRebaselineInProgress()) { + return CommitStatus.Rebaseline_In_Progress; + } + } + if (destinationBranch == null) { return CommitStatus.Branch_Not_Configured; } @@ -219,6 +226,7 @@ public class AtsBranchManagerCore { if (mergeBranchExists) { return CommitStatus.Merge_In_Progress; } + return CommitStatus.Commit_Needed; } diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/CommitStatus.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/CommitStatus.java index e94f2ba92b5..b8cdd27cc39 100644 --- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/CommitStatus.java +++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/branch/CommitStatus.java @@ -21,7 +21,8 @@ public enum CommitStatus { No_Commit_Needed("No Commit Needed"), Merge_In_Progress("Merge in Progress"), Committed("Committed"), - Committed_With_Merge("Committed With Merge"); + Committed_With_Merge("Committed With Merge"), + Rebaseline_In_Progress("Rebaseline In Progress"); private final String displayName; |