Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid W. Miller2012-05-09 16:52:14 -0400
committerRoberto E. Escobar2012-05-09 16:52:14 -0400
commit3ea748c1c57c1e373452b123c67ac717402836b8 (patch)
tree84145fab76e2b0a307187fcd1883315fc34c8cf9 /plugins/org.eclipse.osee.framework.core.message/src/org
parentc66946170431321ec20e8746e085718b27e6f391 (diff)
downloadorg.eclipse.osee-3ea748c1c57c1e373452b123c67ac717402836b8.tar.gz
org.eclipse.osee-3ea748c1c57c1e373452b123c67ac717402836b8.tar.xz
org.eclipse.osee-3ea748c1c57c1e373452b123c67ac717402836b8.zip
refactor: Rename method and parameter in merge branch creation
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.java18
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java14
2 files changed, 16 insertions, 16 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 f40e0bbb4d..8bad7d5b42 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
@@ -27,10 +27,10 @@ public class BranchCreationRequest {
private final int authorId;
private final String creationComment;
- private final int populateBaseTxFromAddressingQueryId;
- private final int destinationBranchId;
+ private final int mergeAddressingQueryId;
+ private final int mergeDestinationBranchId;
- public BranchCreationRequest(BranchType branchType, int sourceTransactionId, int parentBranchId, String branchGuid, String branchName, int associatedArtifactId, int authorId, String creationComment, int populateBaseTxFromAddressingQueryId, int destinationBranchId) {
+ 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;
this.branchName = branchName;
this.associatedArtifactId = associatedArtifactId;
@@ -39,8 +39,8 @@ public class BranchCreationRequest {
this.branchGuid = branchGuid;
this.authorId = authorId;
this.creationComment = creationComment;
- this.populateBaseTxFromAddressingQueryId = populateBaseTxFromAddressingQueryId;
- this.destinationBranchId = destinationBranchId;
+ this.mergeAddressingQueryId = mergeAddressingQueryId;
+ this.mergeDestinationBranchId = destinationBranchId;
}
public String getBranchName() {
@@ -75,12 +75,12 @@ public class BranchCreationRequest {
return creationComment;
}
- public int getPopulateBaseTxFromAddressingQueryId() {
- return populateBaseTxFromAddressingQueryId;
+ public int getMergeAddressingQueryId() {
+ return mergeAddressingQueryId;
}
- public int getDestinationBranchId() {
- return destinationBranchId;
+ public int getMergeDestinationBranchId() {
+ return mergeDestinationBranchId;
}
@Override
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 f624a76160..9949cf0497 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
@@ -32,8 +32,8 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
AUTHOR_ID,
CREATION_COMMENT,
- POPULATE_BASE_TX_FROM_ADDR_QUERY_ID,
- DESTINATION_BRANCH_ID;
+ MERGE_ADDRESSING_QUERY_ID,
+ MERGE_DESTINATION_BRANCH_ID;
}
@Override
@@ -50,11 +50,11 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
String creationComment = store.get(Fields.CREATION_COMMENT.name());
- int populateBaseTxFromAddressingQueryId = store.getInt(Fields.POPULATE_BASE_TX_FROM_ADDR_QUERY_ID.name());
- int destinationBranchId = store.getInt(Fields.DESTINATION_BRANCH_ID.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, populateBaseTxFromAddressingQueryId, destinationBranchId);
+ associatedArtifactId, authorId, creationComment, mergeAddressingQueryId, destinationBranchId);
}
@Override
@@ -69,8 +69,8 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
store.put(Fields.AUTHOR_ID.name(), object.getAuthorId());
store.put(Fields.CREATION_COMMENT.name(), object.getCreationComment());
- store.put(Fields.POPULATE_BASE_TX_FROM_ADDR_QUERY_ID.name(), object.getPopulateBaseTxFromAddressingQueryId());
- store.put(Fields.DESTINATION_BRANCH_ID.name(), object.getDestinationBranchId());
+ store.put(Fields.MERGE_ADDRESSING_QUERY_ID.name(), object.getMergeAddressingQueryId());
+ store.put(Fields.MERGE_DESTINATION_BRANCH_ID.name(), object.getMergeDestinationBranchId());
return store;
}

Back to the top