Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid W. Miller2012-05-17 11:31:37 -0400
committerRoberto E. Escobar2012-05-17 11:31:37 -0400
commitad438e8b6fc798b0e21c4a770d3c46257739676a (patch)
tree2f21aa3f0a75f6ff8d7ba76a26ae3159c00689b6 /plugins/org.eclipse.osee.framework.core.message/src/org
parentbab28cec762a90c075a17f07ba00ae1b7b730b07 (diff)
downloadorg.eclipse.osee-ad438e8b6fc798b0e21c4a770d3c46257739676a.tar.gz
org.eclipse.osee-ad438e8b6fc798b0e21c4a770d3c46257739676a.tar.xz
org.eclipse.osee-ad438e8b6fc798b0e21c4a770d3c46257739676a.zip
feature[ats_MCQKT]: Add branch copy with transaction client side
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.message/src/org')
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java15
2 files changed, 22 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
index 8bad7d5b42..aed5c5ca71 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCreationRequest.java
@@ -29,6 +29,7 @@ public class BranchCreationRequest {
private final String creationComment;
private final int mergeAddressingQueryId;
private final int mergeDestinationBranchId;
+ private boolean isTxCopyBranchType;
public BranchCreationRequest(BranchType branchType, int sourceTransactionId, int parentBranchId, String branchGuid, String branchName, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, int destinationBranchId) {
this.parentBranchId = parentBranchId;
@@ -41,6 +42,7 @@ public class BranchCreationRequest {
this.creationComment = creationComment;
this.mergeAddressingQueryId = mergeAddressingQueryId;
this.mergeDestinationBranchId = destinationBranchId;
+ this.isTxCopyBranchType = false;
}
public String getBranchName() {
@@ -83,6 +85,14 @@ public class BranchCreationRequest {
return mergeDestinationBranchId;
}
+ public boolean txIsCopied() {
+ return isTxCopyBranchType;
+ }
+
+ public void setTxIsCopied(boolean value) {
+ isTxCopyBranchType = value;
+ }
+
@Override
public String toString() {
return "Branch [associatedArtifactId=" + associatedArtifactId + ", branchGuid=" + branchGuid + ", branchType=" + branchType + ", name=" + branchName + ", parentBranchId=" + parentBranchId + ", parentTransactionId=" + sourceTransactionId + "]";
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
index 9949cf0497..b974f3f8b5 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java
@@ -33,7 +33,8 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
CREATION_COMMENT,
MERGE_ADDRESSING_QUERY_ID,
- MERGE_DESTINATION_BRANCH_ID;
+ MERGE_DESTINATION_BRANCH_ID,
+ TX_COPY_BRANCH_TYPE;
}
@Override
@@ -50,11 +51,18 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
String creationComment = store.get(Fields.CREATION_COMMENT.name());
+ boolean isTxCopy = store.getBoolean(Fields.TX_COPY_BRANCH_TYPE.name());
+
int mergeAddressingQueryId = store.getInt(Fields.MERGE_ADDRESSING_QUERY_ID.name());
int destinationBranchId = store.getInt(Fields.MERGE_DESTINATION_BRANCH_ID.name());
- return new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchGuid, branchName,
- associatedArtifactId, authorId, creationComment, mergeAddressingQueryId, destinationBranchId);
+ BranchCreationRequest branchCreationRequest =
+ new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchGuid, branchName,
+ associatedArtifactId, authorId, creationComment, mergeAddressingQueryId, destinationBranchId);
+
+ branchCreationRequest.setTxIsCopied(isTxCopy);
+
+ return branchCreationRequest;
}
@Override
@@ -71,6 +79,7 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
store.put(Fields.MERGE_ADDRESSING_QUERY_ID.name(), object.getMergeAddressingQueryId());
store.put(Fields.MERGE_DESTINATION_BRANCH_ID.name(), object.getMergeDestinationBranchId());
+ store.put(Fields.TX_COPY_BRANCH_TYPE.name(), object.txIsCopied());
return store;
}

Back to the top