From 42adad881f0340672090c2f87610bfdddc34fe38 Mon Sep 17 00:00:00 2001 From: Ryan D. Brooks Date: Wed, 2 Aug 2017 12:12:52 -0700 Subject: bug: Persist of tuples only saved first tuple change Change-Id: Ifab890681b49dc745237e31d110d9be81a75621c --- .../osee/orcs/core/internal/transaction/ChangeSetBuilder.java | 6 ++++-- .../src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/ChangeSetBuilder.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/ChangeSetBuilder.java index 08d52effb7a..e51b56048ef 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/ChangeSetBuilder.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/ChangeSetBuilder.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal.transaction; +import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.List; import java.util.Set; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.orcs.core.ds.ArtifactData; @@ -25,7 +28,6 @@ import org.eclipse.osee.orcs.core.internal.attribute.Attribute; import org.eclipse.osee.orcs.core.internal.relation.Relation; import org.eclipse.osee.orcs.core.internal.relation.RelationVisitor; import org.eclipse.osee.orcs.core.internal.tuple.TupleVisitor; -import com.google.common.collect.Sets; /** * Collect all the dirty OrcsData's into a changeSet; @@ -76,7 +78,7 @@ public class ChangeSetBuilder implements ArtifactVisitor, RelationVisitor, Tuple private final Set arts = Sets.newLinkedHashSet(); private final Set attrs = Sets.newLinkedHashSet(); private final Set rels = Sets.newLinkedHashSet(); - private final Set tuples = Sets.newLinkedHashSet(); + private final List tuples = new ArrayList<>(); @Override public void accept(OrcsVisitor visitor) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java index bb95c59fa9a..2dc5847d503 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal.transaction; +import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; +import java.util.List; import java.util.Map; -import java.util.Set; import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.data.HasBranch; @@ -39,7 +39,7 @@ public class TxData implements HasSession, HasBranch { private final OrcsSession session; private final GraphData graph; - private final Set tuples = new HashSet<>(); + private final List tuples = new ArrayList<>(); private final Map writeables = new HashMap<>(); private final Map readables = new HashMap<>(); -- cgit v1.2.3