Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2014-01-26 00:51:37 +0000
committerRyan D. Brooks2014-01-26 00:51:37 +0000
commit1f8fdec214a4d6756dfd5ff4f711d01cb4ca4700 (patch)
treea8938d00f80112f49bcab258235da4d5b25ec72e /plugins/org.eclipse.osee.framework.manager.servlet
parent21cd0edf1727147e19802a2626f3a8051cfc9f32 (diff)
downloadorg.eclipse.osee-1f8fdec214a4d6756dfd5ff4f711d01cb4ca4700.tar.gz
org.eclipse.osee-1f8fdec214a4d6756dfd5ff4f711d01cb4ca4700.tar.xz
org.eclipse.osee-1f8fdec214a4d6756dfd5ff4f711d01cb4ca4700.zip
refactor: Rename ReadableBranch to BranchReadable
Diffstat (limited to 'plugins/org.eclipse.osee.framework.manager.servlet')
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java6
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java4
6 files changed, 13 insertions, 13 deletions
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java
index 6f337afba57..c4228191a24 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ArchiveBranchCallable.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.message.ChangeBranchArchiveStateRequest;
-import org.eclipse.osee.framework.core.model.ReadableBranch;
+import org.eclipse.osee.framework.core.model.BranchReadable;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.orcs.ApplicationContext;
import org.eclipse.osee.orcs.OrcsApi;
@@ -38,7 +38,7 @@ public class ArchiveBranchCallable extends AbstractBranchCallable<ChangeBranchAr
ArchiveOperation archiveOp =
request.getState().isArchived() ? ArchiveOperation.ARCHIVE : ArchiveOperation.UNARCHIVE;
- Callable<ReadableBranch> callable = getBranchOps().archiveUnarchiveBranch(toArchive, archiveOp);
+ Callable<BranchReadable> callable = getBranchOps().archiveUnarchiveBranch(toArchive, archiveOp);
callAndCheckForCancel(callable);
return Boolean.TRUE;
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java
index 428c7bad005..15adfba7d67 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchStateCallable.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.message.ChangeBranchStateRequest;
-import org.eclipse.osee.framework.core.model.ReadableBranch;
+import org.eclipse.osee.framework.core.model.BranchReadable;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.orcs.ApplicationContext;
import org.eclipse.osee.orcs.OrcsApi;
@@ -36,7 +36,7 @@ public class ChangeBranchStateCallable extends AbstractBranchCallable<ChangeBran
IOseeBranch toModify = getBranchOps().getBranchFromId(request.getBranchId());
BranchState newBranchState = request.getState();
- Callable<ReadableBranch> callable = getBranchOps().changeBranchState(toModify, newBranchState);
+ Callable<BranchReadable> callable = getBranchOps().changeBranchState(toModify, newBranchState);
callAndCheckForCancel(callable);
return Boolean.TRUE;
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java
index e9ba763c4c4..63d19adcd38 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/ChangeBranchTypeCallable.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.message.ChangeBranchTypeRequest;
-import org.eclipse.osee.framework.core.model.ReadableBranch;
+import org.eclipse.osee.framework.core.model.BranchReadable;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.orcs.ApplicationContext;
import org.eclipse.osee.orcs.OrcsApi;
@@ -36,7 +36,7 @@ public class ChangeBranchTypeCallable extends AbstractBranchCallable<ChangeBranc
IOseeBranch toModify = getBranchOps().getBranchFromId(request.getBranchId());
BranchType newBranchType = request.getType();
- Callable<ReadableBranch> callable = getBranchOps().changeBranchType(toModify, newBranchType);
+ Callable<BranchReadable> callable = getBranchOps().changeBranchType(toModify, newBranchType);
callAndCheckForCancel(callable);
return Boolean.TRUE;
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
index 897d0ec7f55..d3278e78deb 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CommitBranchCallable.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.message.BranchCommitRequest;
import org.eclipse.osee.framework.core.message.BranchCommitResponse;
-import org.eclipse.osee.framework.core.model.ReadableBranch;
+import org.eclipse.osee.framework.core.model.BranchReadable;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.orcs.ApplicationContext;
@@ -49,7 +49,7 @@ public class CommitBranchCallable extends AbstractBranchCallable<BranchCommitReq
responseData.setTransaction(transactionRecord);
if (request.isArchiveAllowed()) {
- Callable<ReadableBranch> archiveCallable =
+ Callable<BranchReadable> archiveCallable =
getBranchOps().archiveUnarchiveBranch(source, ArchiveOperation.ARCHIVE);
callAndCheckForCancel(archiveCallable);
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
index 32d13bec03c..191e60eac79 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/CreateBranchCallable.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.message.BranchCreationRequest;
import org.eclipse.osee.framework.core.message.BranchCreationResponse;
-import org.eclipse.osee.framework.core.model.ReadableBranch;
+import org.eclipse.osee.framework.core.model.BranchReadable;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.orcs.ApplicationContext;
import org.eclipse.osee.orcs.OrcsApi;
@@ -54,11 +54,11 @@ public class CreateBranchCallable extends AbstractBranchCallable<BranchCreationR
createData.setMergeDestinationBranchId(request.getMergeDestinationBranchId());
createData.setMergeAddressingQueryId(request.getMergeAddressingQueryId());
createData.setTxCopyBranchType(request.txIsCopied());
- Callable<ReadableBranch> callable;
+ Callable<BranchReadable> callable;
callable = getBranchOps().createBranch(createData);
- ReadableBranch newBranch = callAndCheckForCancel(callable);
+ BranchReadable newBranch = callAndCheckForCancel(callable);
BranchCreationResponse creationResponse = new BranchCreationResponse(-1);
creationResponse.setBranchId(newBranch.getId());
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java
index 9367506a8be..e8695bf7bde 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/branch/PurgeBranchCallable.java
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreTranslatorId;
import org.eclipse.osee.framework.core.message.PurgeBranchRequest;
-import org.eclipse.osee.framework.core.model.ReadableBranch;
+import org.eclipse.osee.framework.core.model.BranchReadable;
import org.eclipse.osee.framework.core.translation.IDataTranslationService;
import org.eclipse.osee.orcs.ApplicationContext;
import org.eclipse.osee.orcs.OrcsApi;
@@ -36,7 +36,7 @@ public class PurgeBranchCallable extends AbstractBranchCallable<PurgeBranchReque
IOseeBranch toPurge = getBranchOps().getBranchFromId(request.getBranchId());
boolean recurse = request.isRecursive();
- Callable<List<ReadableBranch>> callable = getBranchOps().purgeBranch(toPurge, recurse);
+ Callable<List<BranchReadable>> callable = getBranchOps().purgeBranch(toPurge, recurse);
callAndCheckForCancel(callable);
return Boolean.TRUE;

Back to the top