Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2014-03-28 11:48:55 -0400
committerdonald.g.dunne2014-04-09 11:32:55 -0400
commit1f8e94e66234595711ccb229869d8ca2b4ed9489 (patch)
tree6febe577cd4f1d9a548d942e626695fd7214f6bf /plugins/org.eclipse.osee.framework.core.message/src/org
parent568a307e7e6655ada9a1638e2cb76cb9f79699b7 (diff)
downloadorg.eclipse.osee-1f8e94e66234595711ccb229869d8ca2b4ed9489.tar.gz
org.eclipse.osee-1f8e94e66234595711ccb229869d8ca2b4ed9489.tar.xz
org.eclipse.osee-1f8e94e66234595711ccb229869d8ca2b4ed9489.zip
feature[ats_ATS19845]: Convert IOseeBranch to Identity-Long
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/AbstractBranchCacheMessage.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java28
-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/BranchRow.java22
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java41
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/BranchCreationRequestTranslator.java5
9 files changed, 56 insertions, 68 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java
index 09cba7ce78..90b2dbe511 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/AbstractBranchCacheMessage.java
@@ -27,7 +27,7 @@ public abstract class AbstractBranchCacheMessage {
private final Map<Long, Integer> branchToSourceTx;
private final Map<Long, Integer> branchToAssocArt;
private final Map<Long, String[]> branchToAliases;
- private final List<Triplet<String, String, String>> srcDestMerge;
+ private final List<Triplet<Long, Long, Long>> srcDestMerge;
protected AbstractBranchCacheMessage() {
this.rows = new ArrayList<BranchRow>();
@@ -36,7 +36,7 @@ public abstract class AbstractBranchCacheMessage {
this.branchToSourceTx = new HashMap<Long, Integer>();
this.branchToAssocArt = new HashMap<Long, Integer>();
this.branchToAliases = new HashMap<Long, String[]>();
- this.srcDestMerge = new ArrayList<Triplet<String, String, String>>();
+ this.srcDestMerge = new ArrayList<Triplet<Long, Long, Long>>();
}
public List<BranchRow> getBranchRows() {
@@ -63,7 +63,7 @@ public abstract class AbstractBranchCacheMessage {
return branchToAliases;
}
- public List<Triplet<String, String, String>> getMergeBranches() {
+ public List<Triplet<Long, Long, Long>> getMergeBranches() {
return srcDestMerge;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java
index fd8e99d567..1d868d8fb3 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/ArtifactTypeCacheUpdateResponse.java
@@ -22,9 +22,9 @@ public class ArtifactTypeCacheUpdateResponse {
private final List<ArtifactTypeRow> rows;
private final Map<Long, Long[]> baseToSuper;
- private final List<Triplet<Long, String, Long>> artAttrs;
+ private final List<Triplet<Long, Long, Long>> artAttrs;
- public ArtifactTypeCacheUpdateResponse(List<ArtifactTypeRow> rows, Map<Long, Long[]> baseToSuper, List<Triplet<Long, String, Long>> artAttrs) {
+ public ArtifactTypeCacheUpdateResponse(List<ArtifactTypeRow> rows, Map<Long, Long[]> baseToSuper, List<Triplet<Long, Long, Long>> artAttrs) {
this.rows = rows;
this.baseToSuper = baseToSuper;
this.artAttrs = artAttrs;
@@ -38,7 +38,7 @@ public class ArtifactTypeCacheUpdateResponse {
return baseToSuper;
}
- public List<Triplet<Long, String, Long>> getAttributeTypes() {
+ public List<Triplet<Long, Long, Long>> getAttributeTypes() {
return artAttrs;
}
@@ -49,7 +49,7 @@ public class ArtifactTypeCacheUpdateResponse {
private final boolean isAbstract;
private StorageState storageState;
- public ArtifactTypeRow(long id, Long guid, String name, boolean isAbstract, StorageState storageState) {
+ public ArtifactTypeRow(long id, long guid, String name, boolean isAbstract, StorageState storageState) {
this.id = id;
this.guid = guid;
this.name = name;
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java
index bb0f8adf53..4371b7ced9 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateResponse.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
*/
public class BranchCacheUpdateResponse extends AbstractBranchCacheMessage {
- public static BranchCacheUpdateResponse fromCache(IOseeCache<String, Branch> cache, Collection<Branch> types) throws OseeCoreException {
+ public static BranchCacheUpdateResponse fromCache(IOseeCache<Long, Branch> cache, Collection<Branch> types) throws OseeCoreException {
BranchCacheUpdateResponse response = new BranchCacheUpdateResponse();
BranchCacheUpdateUtil.loadFromCache(response, types);
return response;
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
index 428686c92f..0e884791ee 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchCacheUpdateUtil.java
@@ -27,7 +27,6 @@ import org.eclipse.osee.framework.core.model.cache.TransactionCache;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.type.Triplet;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
/**
* @author Megumi Telles
@@ -53,7 +52,7 @@ public final class BranchCacheUpdateUtil {
this.txCache = txCache;
}
- public Collection<Branch> updateCache(AbstractBranchCacheMessage cacheMessage, IOseeCache<String, Branch> cache) throws OseeCoreException {
+ public Collection<Branch> updateCache(AbstractBranchCacheMessage cacheMessage, IOseeCache<Long, Branch> cache) throws OseeCoreException {
List<Branch> updatedItems = new ArrayList<Branch>();
Map<Long, Integer> branchToAssocArt = cacheMessage.getBranchToAssocArt();
@@ -63,9 +62,8 @@ public final class BranchCacheUpdateUtil {
for (BranchRow srcItem : cacheMessage.getBranchRows()) {
long branchId = srcItem.getBranchId();
Branch updated =
- factory.createOrUpdate(cache, srcItem.getBranchGuid(), srcItem.getBranchId(), srcItem.getBranchName(),
- srcItem.getBranchType(), srcItem.getBranchState(), srcItem.getBranchArchived().isArchived(),
- srcItem.getStorageState());
+ factory.createOrUpdate(cache, branchId, srcItem.getBranchName(), srcItem.getBranchType(),
+ srcItem.getBranchState(), srcItem.getBranchArchived().isArchived(), srcItem.getStorageState());
updatedItems.add(updated);
Integer artifactId = branchToAssocArt.get(branchId);
@@ -86,9 +84,9 @@ public final class BranchCacheUpdateUtil {
}
}
}
- for (Triplet<String, String, String> entry : cacheMessage.getMergeBranches()) {
- IOseeBranch sourceBranch = Strings.isValid(entry.getFirst()) ? cache.getByGuid(entry.getFirst()) : null;
- IOseeBranch destinationBranch = Strings.isValid(entry.getSecond()) ? cache.getByGuid(entry.getSecond()) : null;
+ for (Triplet<Long, Long, Long> entry : cacheMessage.getMergeBranches()) {
+ IOseeBranch sourceBranch = entry.getFirst() > 0 ? cache.getByGuid(entry.getFirst()) : null;
+ IOseeBranch destinationBranch = entry.getSecond() > 0 ? cache.getByGuid(entry.getSecond()) : null;
Branch branch = cache.getByGuid(entry.getThird());
MergeBranch mergeBranch = null;
@@ -132,8 +130,8 @@ public final class BranchCacheUpdateUtil {
for (Branch br : types) {
Long branchId = br.getId();
message.getBranchRows().add(
- new BranchRow(br.getId(), br.getGuid(), br.getName(), br.getBranchType(), br.getBranchState(),
- br.getArchiveState(), br.getStorageState()));
+ new BranchRow(br.getId(), br.getName(), br.getBranchType(), br.getBranchState(), br.getArchiveState(),
+ br.getStorageState()));
if (br.hasParentBranch()) {
message.getChildToParent().put(branchId, br.getParentBranch().getId());
}
@@ -154,11 +152,11 @@ public final class BranchCacheUpdateUtil {
}
}
- private static void addMergeBranches(List<Triplet<String, String, String>> srcDestMerge, MergeBranch mergeBranch) throws OseeCoreException {
- String src = mergeBranch.getSourceBranch() != null ? mergeBranch.getSourceBranch().getGuid() : null;
- String dest = mergeBranch.getDestinationBranch() != null ? mergeBranch.getDestinationBranch().getGuid() : null;
- String merge = mergeBranch.getGuid();
- srcDestMerge.add(new Triplet<String, String, String>(src, dest, merge));
+ private static void addMergeBranches(List<Triplet<Long, Long, Long>> srcDestMerge, MergeBranch mergeBranch) throws OseeCoreException {
+ Long src = mergeBranch.getSourceBranch() != null ? mergeBranch.getSourceBranch().getGuid() : null;
+ Long dest = mergeBranch.getDestinationBranch() != null ? mergeBranch.getDestinationBranch().getGuid() : null;
+ Long merge = mergeBranch.getGuid();
+ srcDestMerge.add(new Triplet<Long, Long, Long>(src, dest, merge));
}
private static void addTxRecord(Map<Long, Integer> map, Long branchId, TransactionRecord toAdd) {
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 a9ae76618f..59563e03ff 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
@@ -23,7 +23,6 @@ public class BranchCreationRequest {
private final BranchType branchType;
private final int sourceTransactionId;
- private final String branchGuid;
private final int authorId;
@@ -33,7 +32,7 @@ public class BranchCreationRequest {
private boolean isTxCopyBranchType;
private final long branchUuid;
- public BranchCreationRequest(BranchType branchType, int sourceTransactionId, long parentBranchId, String branchGuid, String branchName, long branchUuid, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, long destinationBranchId) {
+ public BranchCreationRequest(BranchType branchType, int sourceTransactionId, long parentBranchId, String branchName, long branchUuid, int associatedArtifactId, int authorId, String creationComment, int mergeAddressingQueryId, long destinationBranchId) {
this.parentBranchId = parentBranchId;
this.branchName = branchName;
if (branchUuid <= 0) {
@@ -43,7 +42,6 @@ public class BranchCreationRequest {
this.associatedArtifactId = associatedArtifactId;
this.branchType = branchType;
this.sourceTransactionId = sourceTransactionId;
- this.branchGuid = branchGuid;
this.authorId = authorId;
this.creationComment = creationComment;
this.mergeAddressingQueryId = mergeAddressingQueryId;
@@ -71,10 +69,6 @@ public class BranchCreationRequest {
return sourceTransactionId;
}
- public String getBranchGuid() {
- return branchGuid;
- }
-
public int getAuthorId() {
return authorId;
}
@@ -101,7 +95,7 @@ public class BranchCreationRequest {
@Override
public String toString() {
- return "Branch [associatedArtifactId=" + associatedArtifactId + ", branchGuid=" + branchGuid + ", branchType=" + branchType + ", name=" + branchName + ", parentBranchId=" + parentBranchId + ", parentTransactionId=" + sourceTransactionId + "]";
+ return "Branch [associatedArtifactId=" + associatedArtifactId + ", branchUuid=" + branchUuid + ", branchType=" + branchType + ", name=" + branchName + ", parentBranchId=" + parentBranchId + ", parentTransactionId=" + sourceTransactionId + "]";
}
public long getBranchUuid() {
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java
index bd17e50eec..2d6b3d45fc 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java
@@ -17,7 +17,6 @@ import org.eclipse.osee.framework.core.enums.StorageState;
public final class BranchRow {
private final long branchId;
- private final String branchGuid;
private final String branchName;
private final BranchType branchType;
@@ -30,9 +29,8 @@ public final class BranchRow {
this.storageState = storageState;
}
- public BranchRow(long branchId, String branchGuid, String branchName, BranchType branchType, BranchState branchState, BranchArchivedState branchArchived, StorageState storageState) {
+ public BranchRow(long branchId, String branchName, BranchType branchType, BranchState branchState, BranchArchivedState branchArchived, StorageState storageState) {
this.branchId = branchId;
- this.branchGuid = branchGuid;
this.branchName = branchName;
this.branchType = branchType;
this.branchState = branchState;
@@ -44,10 +42,6 @@ public final class BranchRow {
return branchId;
}
- public String getBranchGuid() {
- return branchGuid;
- }
-
public String getBranchName() {
return branchName;
}
@@ -71,7 +65,6 @@ public final class BranchRow {
public String[] toArray() {
return new String[] {
getBranchArchived().name(),
- getBranchGuid(),
String.valueOf(getBranchId()),
getBranchName(),
getBranchState().name(),
@@ -81,12 +74,11 @@ public final class BranchRow {
public static BranchRow fromArray(String[] data) {
BranchArchivedState archived = BranchArchivedState.valueOf(data[0]);
- String branchGuid = data[1];
- long branchId = Long.valueOf(data[2]);
- String branchName = data[3];
- BranchState branchState = BranchState.valueOf(data[4]);
- BranchType branchType = BranchType.valueOf(data[5]);
- StorageState storageState = StorageState.valueOf(data[6]);
- return new BranchRow(branchId, branchGuid, branchName, branchType, branchState, archived, storageState);
+ long branchId = Long.valueOf(data[1]);
+ String branchName = data[2];
+ BranchState branchState = BranchState.valueOf(data[3]);
+ BranchType branchType = BranchType.valueOf(data[4]);
+ StorageState storageState = StorageState.valueOf(data[5]);
+ return new BranchRow(branchId, branchName, branchType, branchState, archived, storageState);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
index d3249606fb..708485f32b 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/TranslationUtil.java
@@ -49,19 +49,19 @@ public final class TranslationUtil {
store.put(key.name(), arrayMapToStore(map));
}
- public static void loadTripletList(List<Triplet<String, String, String>> data, PropertyStore store, Enum<?> key) {
+ public static void loadTripletList(List<Triplet<Long, Long, Long>> data, PropertyStore store, Enum<?> key) {
storeToStringTripletList(data, store.getPropertyStore(key.name()));
}
- public static void loadTripletLongList(List<Triplet<Long, String, Long>> data, PropertyStore store, Enum<?> key) {
+ public static void loadTripletLongList(List<Triplet<Long, Long, Long>> data, PropertyStore store, Enum<?> key) {
storeToTripletList(data, store.getPropertyStore(key.name()));
}
- public static void putTripletList(PropertyStore store, Enum<?> key, List<Triplet<String, String, String>> list) {
+ public static void putTripletList(PropertyStore store, Enum<?> key, List<Triplet<Long, Long, Long>> list) {
store.put(key.name(), tripletListToStore(list));
}
- public static void putTripletLongList(PropertyStore store, Enum<?> key, List<Triplet<Long, String, Long>> list) {
+ public static void putTripletLongList(PropertyStore store, Enum<?> key, List<Triplet<Long, Long, Long>> list) {
store.put(key.name(), tripletLongListToStore(list));
}
@@ -138,38 +138,45 @@ public final class TranslationUtil {
}
}
- private static void storeToTripletList(List<Triplet<Long, String, Long>> data, PropertyStore innerStore) {
+ private static void storeToTripletList(List<Triplet<Long, Long, Long>> data, PropertyStore innerStore) {
for (String strKey : innerStore.arrayKeySet()) {
String[] value = innerStore.getArray(strKey);
- data.add(new Triplet<Long, String, Long>(Long.valueOf(value[0]), value[1], Long.valueOf(value[2])));
+ data.add(new Triplet<Long, Long, Long>(Long.valueOf(value[0]), Long.valueOf(value[1]), Long.valueOf(value[2])));
}
}
- private static void storeToStringTripletList(List<Triplet<String, String, String>> data, PropertyStore innerStore) {
+ private static void storeToStringTripletList(List<Triplet<Long, Long, Long>> data, PropertyStore innerStore) {
for (String strKey : innerStore.arrayKeySet()) {
String[] value = innerStore.getArray(strKey);
- data.add(new Triplet<String, String, String>(value[0], value[1], value[2]));
+ data.add(new Triplet<Long, Long, Long>(Long.valueOf(value[0]), Long.valueOf(value[1]), Long.valueOf(value[2])));
}
}
- private static PropertyStore tripletListToStore(List<Triplet<String, String, String>> list) {
+ private static PropertyStore tripletListToStore(List<Triplet<Long, Long, Long>> list) {
PropertyStore innerStore = new PropertyStore();
int index = 0;
- for (Triplet<String, String, String> entry : list) {
- innerStore.put(String.valueOf(index), new String[] {entry.getFirst(), entry.getSecond(), entry.getThird()});
+ for (Triplet<Long, Long, Long> entry : list) {
+ innerStore.put(
+ String.valueOf(index),
+ new String[] {
+ String.valueOf(entry.getFirst()),
+ String.valueOf(entry.getSecond()),
+ String.valueOf(entry.getThird())});
index++;
}
return innerStore;
}
- private static PropertyStore tripletLongListToStore(List<Triplet<Long, String, Long>> list) {
+ private static PropertyStore tripletLongListToStore(List<Triplet<Long, Long, Long>> list) {
PropertyStore innerStore = new PropertyStore();
int index = 0;
- for (Triplet<Long, String, Long> entry : list) {
- innerStore.put(String.valueOf(index), new String[] {
- String.valueOf(entry.getFirst()),
- entry.getSecond(),
- String.valueOf(entry.getThird())});
+ for (Triplet<Long, Long, Long> entry : list) {
+ innerStore.put(
+ String.valueOf(index),
+ new String[] {
+ String.valueOf(entry.getFirst()),
+ String.valueOf(entry.getSecond()),
+ String.valueOf(entry.getThird())});
index++;
}
return innerStore;
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java
index 70e57dff81..fd67c6bd35 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/ArtifactTypeCacheUpdateResponseTranslator.java
@@ -37,7 +37,7 @@ public class ArtifactTypeCacheUpdateResponseTranslator implements ITranslator<Ar
public ArtifactTypeCacheUpdateResponse convert(PropertyStore store) {
List<ArtifactTypeRow> rows = new ArrayList<ArtifactTypeRow>();
Map<Long, Long[]> baseToSuper = new HashMap<Long, Long[]>();
- List<Triplet<Long, String, Long>> artAttrs = new ArrayList<Triplet<Long, String, Long>>();
+ List<Triplet<Long, Long, Long>> artAttrs = new ArrayList<Triplet<Long, Long, Long>>();
int rowCount = store.getInt(Fields.ITEM_COUNT.name());
for (int index = 0; index < rowCount; index++) {
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 0ebecc5273..15c83637c9 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
@@ -27,7 +27,6 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
BRANCH_TYPE,
SOURCE_TX_ID,
- BRANCH_GUID,
BRANCH_UUID,
AUTHOR_ID,
@@ -46,7 +45,6 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
BranchType branchType = BranchType.valueOf(store.get(Fields.BRANCH_TYPE.name()));
int sourceTransactionId = store.getInt(Fields.SOURCE_TX_ID.name());
- String branchGuid = store.get(Fields.BRANCH_GUID.name());
int authorId = store.getInt(Fields.AUTHOR_ID.name());
@@ -59,7 +57,7 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
long branchUuid = store.getLong(Fields.BRANCH_UUID.name());
BranchCreationRequest branchCreationRequest =
- new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchGuid, branchName, branchUuid,
+ new BranchCreationRequest(branchType, sourceTransactionId, parentBranchId, branchName, branchUuid,
associatedArtifactId, authorId, creationComment, mergeAddressingQueryId, destinationBranchId);
branchCreationRequest.setTxIsCopied(isTxCopy);
@@ -75,7 +73,6 @@ public class BranchCreationRequestTranslator implements ITranslator<BranchCreati
store.put(Fields.ASSOCIATED_ART_ID.name(), object.getAssociatedArtifactId());
store.put(Fields.BRANCH_TYPE.name(), object.getBranchType().name());
store.put(Fields.SOURCE_TX_ID.name(), object.getSourceTransactionId());
- store.put(Fields.BRANCH_GUID.name(), object.getBranchGuid());
store.put(Fields.BRANCH_UUID.name(), object.getBranchUuid());
store.put(Fields.AUTHOR_ID.name(), object.getAuthorId());
store.put(Fields.CREATION_COMMENT.name(), object.getCreationComment());

Back to the top