diff options
| author | rescobar | 2009-09-23 23:40:56 +0000 |
|---|---|---|
| committer | rescobar | 2009-09-23 23:40:56 +0000 |
| commit | c5948a4051853e0f561b06b524fbd0942fb5224a (patch) | |
| tree | d4820d9680970daba8f72bb5b886d4fc9696abfb /org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java | |
| parent | 9726f3a35a9840c6b1bd0be5eb1efe6e9ed085b9 (diff) | |
| download | org.eclipse.osee-c5948a4051853e0f561b06b524fbd0942fb5224a.tar.gz org.eclipse.osee-c5948a4051853e0f561b06b524fbd0942fb5224a.tar.xz org.eclipse.osee-c5948a4051853e0f561b06b524fbd0942fb5224a.zip | |
Prepare Branch logic for server move.
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 | 4 |
1 files changed, 2 insertions, 2 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 319a8b981e2..5f88c6cc8f7 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 @@ -215,7 +215,7 @@ public class AtsBranchManager { Branch branch = getWorkingBranch();
if (promptUser) {
StringBuilder message = new StringBuilder();
- if (branch.hasChanges()) {
+ if (BranchManager.hasChanges(branch)) {
message.append("Warning: Changes have been made on this branch.\n\n");
}
message.append("Are you sure you want to delete the branch: ");
@@ -516,7 +516,7 @@ public class AtsBranchManager { * @throws OseeCoreException
*/
public boolean isWorkingBranchArchived() throws OseeCoreException {
- return getWorkingBranch(true, false) != null && getWorkingBranch(true, false).isArchived();
+ return getWorkingBranch(true, false) != null && getWorkingBranch(true, false).getArchiveState().isArchived();
}
/**
|