Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2017-08-02 16:57:31 -0400
committerRyan Brooks2017-08-07 11:32:36 -0400
commit17117a2556dddf776f2a58daa62aca019f681e77 (patch)
tree1e283960fecb4542e5828a7e0d90af05486a7896
parent4ef08fed930a5564aada067eb1728e8a1f300178 (diff)
downloadorg.eclipse.osee-17117a2556dddf776f2a58daa62aca019f681e77.tar.gz
org.eclipse.osee-17117a2556dddf776f2a58daa62aca019f681e77.tar.xz
org.eclipse.osee-17117a2556dddf776f2a58daa62aca019f681e77.zip
refactor: Streamline tuple object creation
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java22
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleFactory.java41
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManager.java27
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManagerFactory.java21
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleMangerImpl.java49
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java43
9 files changed, 35 insertions, 189 deletions
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java
index 2a702cc3d3..db1a572092 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxCallableFactoryTest.java
@@ -28,13 +28,13 @@ import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
import org.eclipse.osee.orcs.core.ds.TransactionData;
import org.eclipse.osee.orcs.core.ds.TransactionResult;
+import org.eclipse.osee.orcs.core.ds.TupleDataFactory;
import org.eclipse.osee.orcs.core.ds.TxDataStore;
import org.eclipse.osee.orcs.core.internal.artifact.ArtifactFactory;
import org.eclipse.osee.orcs.core.internal.graph.GraphData;
import org.eclipse.osee.orcs.core.internal.proxy.ExternalArtifactManager;
import org.eclipse.osee.orcs.core.internal.relation.RelationManager;
import org.eclipse.osee.orcs.core.internal.transaction.TxDataManager.TxDataLoader;
-import org.eclipse.osee.orcs.core.internal.tuple.TupleManager;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.TransactionReadable;
import org.junit.Assert;
@@ -65,7 +65,7 @@ public class TxCallableFactoryTest {
@Mock private ArtifactFactory artifactFactory;
@Mock private RelationManager relationManager;
@Mock private TxDataLoader loader;
- @Mock private TupleManager tupleManager;
+ @Mock private TupleDataFactory tupleFactory;
@Mock private GraphData graph;
@Mock private TxDataStore txDataStore;
@@ -84,7 +84,7 @@ public class TxCallableFactoryTest {
@Before
public void init() {
MockitoAnnotations.initMocks(this);
- txManager = new TxDataManager(proxyManager, artifactFactory, relationManager, tupleManager, loader);
+ txManager = new TxDataManager(proxyManager, artifactFactory, relationManager, tupleFactory, loader);
txFactory = new TxCallableFactory(logger, txDataStore, txManager);
data = new TxData(session, graph);
when(graph.getBranch()).thenReturn(COMMON);
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
index dcf9da4b49..89b8fd8c73 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java
@@ -45,6 +45,7 @@ import org.eclipse.osee.orcs.OrcsSession;
import org.eclipse.osee.orcs.core.ds.ArtifactData;
import org.eclipse.osee.orcs.core.ds.TransactionData;
import org.eclipse.osee.orcs.core.ds.TupleData;
+import org.eclipse.osee.orcs.core.ds.TupleDataFactory;
import org.eclipse.osee.orcs.core.ds.VersionData;
import org.eclipse.osee.orcs.core.internal.artifact.Artifact;
import org.eclipse.osee.orcs.core.internal.artifact.ArtifactFactory;
@@ -57,7 +58,6 @@ import org.eclipse.osee.orcs.core.internal.relation.RelationNode;
import org.eclipse.osee.orcs.core.internal.relation.impl.RelationNodeAdjacencies;
import org.eclipse.osee.orcs.core.internal.transaction.TxData.TxState;
import org.eclipse.osee.orcs.core.internal.transaction.TxDataManager.TxDataLoader;
-import org.eclipse.osee.orcs.core.internal.tuple.TupleManager;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.search.QueryFactory;
import org.junit.Before;
@@ -90,7 +90,7 @@ public class TxDataManagerTest {
@Mock private QueryFactory queryFactory;
@Mock private RelationManager relationManager;
@Mock private TxDataLoader loader;
- @Mock private TupleManager tupleManager;
+ @Mock private TupleDataFactory tupleFactory;
@Mock private TxData txData;
@@ -119,7 +119,7 @@ public class TxDataManagerTest {
@Before
public void init() throws OseeCoreException {
MockitoAnnotations.initMocks(this);
- txDataManager = new TxDataManager(proxyManager, artifactFactory, relationManager, tupleManager, loader);
+ txDataManager = new TxDataManager(proxyManager, artifactFactory, relationManager, tupleFactory, loader);
when(artifact1.getExistingAttributeTypes()).thenAnswer(answerValue(types));
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
index 0875aad4a2..bcd73c7dec 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/OrcsApiImpl.java
@@ -65,9 +65,6 @@ import org.eclipse.osee.orcs.core.internal.transaction.TxDataLoaderImpl;
import org.eclipse.osee.orcs.core.internal.transaction.TxDataLoaderImpl.TransactionProvider;
import org.eclipse.osee.orcs.core.internal.transaction.TxDataManager;
import org.eclipse.osee.orcs.core.internal.transaction.TxDataManager.TxDataLoader;
-import org.eclipse.osee.orcs.core.internal.tuple.TupleFactory;
-import org.eclipse.osee.orcs.core.internal.tuple.TupleManager;
-import org.eclipse.osee.orcs.core.internal.tuple.TupleManagerFactory;
import org.eclipse.osee.orcs.core.internal.types.BranchHierarchyProvider;
import org.eclipse.osee.orcs.core.internal.types.OrcsTypesModule;
import org.eclipse.osee.orcs.data.ArtifactReadable;
@@ -182,9 +179,6 @@ public class OrcsApiImpl implements OrcsApi {
RelationManager relationManager = RelationManagerFactory.createRelationManager(logger,
orcsTypes.getRelationTypes(), relationFactory, nodeLoader, queryModuleProvider);
- TupleFactory tupleFactory = new TupleFactory(module.getDataFactory());
- TupleManager tupleManager = TupleManagerFactory.createTupleManager(tupleFactory);
-
GraphProvider graphProvider = new GraphProvider() {
@Override
@@ -206,7 +200,8 @@ public class OrcsApiImpl implements OrcsApi {
TxDataLoader txDataLoader = new TxDataLoaderImpl(module.getDataLoaderFactory(), graphFactory, graphBuilderFactory,
graphProvider, txProvider);
- txDataManager = new TxDataManager(proxyManager, artifactFactory, relationManager, tupleManager, txDataLoader);
+ txDataManager =
+ new TxDataManager(proxyManager, artifactFactory, relationManager, module.getDataFactory(), txDataLoader);
txCallableFactory = new TxCallableFactory(logger, module.getTxDataStore(), txDataManager);
queryModule = new QueryModule(logger, module.getQueryEngine(), graphBuilderFactory, graphProvider,
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java
index bcc9c1dd56..87b0e31386 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java
@@ -35,6 +35,7 @@ import org.eclipse.osee.orcs.OrcsSession;
import org.eclipse.osee.orcs.core.ds.OrcsChangeSet;
import org.eclipse.osee.orcs.core.ds.TransactionData;
import org.eclipse.osee.orcs.core.ds.TupleData;
+import org.eclipse.osee.orcs.core.ds.TupleDataFactory;
import org.eclipse.osee.orcs.core.internal.artifact.Artifact;
import org.eclipse.osee.orcs.core.internal.artifact.ArtifactFactory;
import org.eclipse.osee.orcs.core.internal.graph.GraphData;
@@ -44,7 +45,6 @@ import org.eclipse.osee.orcs.core.internal.relation.RelationManager;
import org.eclipse.osee.orcs.core.internal.relation.RelationNode;
import org.eclipse.osee.orcs.core.internal.relation.impl.RelationNodeAdjacencies;
import org.eclipse.osee.orcs.core.internal.transaction.TxData.TxState;
-import org.eclipse.osee.orcs.core.internal.tuple.TupleManager;
import org.eclipse.osee.orcs.data.ArtifactReadable;
/**
@@ -66,15 +66,15 @@ public class TxDataManager {
private final ExternalArtifactManager proxyManager;
private final ArtifactFactory artifactFactory;
private final RelationManager relationManager;
- private final TupleManager tupleManager;
+ private final TupleDataFactory tupleFactory;
private final TxDataLoader loader;
- public TxDataManager(ExternalArtifactManager proxyManager, ArtifactFactory artifactFactory, RelationManager relationManager, TupleManager tupleManager, TxDataLoader loader) {
+ public TxDataManager(ExternalArtifactManager proxyManager, ArtifactFactory artifactFactory, RelationManager relationManager, TupleDataFactory tupleFactory, TxDataLoader loader) {
this.proxyManager = proxyManager;
this.artifactFactory = artifactFactory;
this.relationManager = relationManager;
this.loader = loader;
- this.tupleManager = tupleManager;
+ this.tupleFactory = tupleFactory;
}
public TxData createTxData(OrcsSession session, BranchId branch) throws OseeCoreException {
@@ -236,16 +236,22 @@ public class TxDataManager {
txData.setAuthor(author);
}
- public Long createTuple2(TxData txData, BranchId branch, Long tupleTypeId, Long element1, Long element2) {
- return tupleManager.addTupple2(txData, branch, tupleTypeId, element1, element2);
+ public Long createTuple2(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2) {
+ TupleData tuple = tupleFactory.createTuple2Data(tupleTypeId, branch, e1, e2);
+ txData.add(tuple);
+ return tuple.getVersion().getGammaId();
}
public Long createTuple3(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2, Long e3) {
- return tupleManager.addTupple3(txData, branch, tupleTypeId, e1, e2, e3);
+ TupleData tuple = tupleFactory.createTuple3Data(tupleTypeId, branch, e1, e2, e3);
+ txData.add(tuple);
+ return tuple.getVersion().getGammaId();
}
public Long createTuple4(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2, Long e3, Long e4) {
- return tupleManager.addTupple4(txData, branch, tupleTypeId, e1, e2, e3, e4);
+ TupleData tuple = tupleFactory.createTuple4Data(tupleTypeId, branch, e1, e2, e3, e4);
+ txData.add(tuple);
+ return tuple.getVersion().getGammaId();
}
public ArtifactReadable createArtifact(TxData txData, IArtifactType artifactType, String name, String guid) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleFactory.java
deleted file mode 100644
index 60a716abdb..0000000000
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.core.internal.tuple;
-
-import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.orcs.core.ds.TupleData;
-import org.eclipse.osee.orcs.core.ds.TupleDataFactory;
-
-/**
- * @author Angel Avila
- */
-public class TupleFactory {
-
- private final TupleDataFactory tupleDataFactory;
-
- public TupleFactory(TupleDataFactory tupleDataFactory) {
- this.tupleDataFactory = tupleDataFactory;
- }
-
- public TupleData createTuple2(Long tupleTypeId, BranchId branch, Long e1, Long e2) throws OseeCoreException {
- return tupleDataFactory.createTuple2Data(tupleTypeId, branch, e1, e2);
- }
-
- public TupleData createTuple3(Long tupleTypeId, BranchId branch, Long e1, Long e2, Long e3) throws OseeCoreException {
- return tupleDataFactory.createTuple3Data(tupleTypeId, branch, e1, e2, e3);
- }
-
- public TupleData createTuple4(Long tupleTypeId, BranchId branch, Long e1, Long e2, Long e3, Long e4) throws OseeCoreException {
- return tupleDataFactory.createTuple4Data(tupleTypeId, branch, e1, e2, e3, e4);
- }
-
-}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManager.java
deleted file mode 100644
index 1e7ed72e21..0000000000
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.core.internal.tuple;
-
-import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.orcs.core.internal.transaction.TxData;
-
-/**
- * @author Angel Avila
- */
-public interface TupleManager {
-
- Long addTupple2(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2);
-
- Long addTupple3(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2, Long e3);
-
- Long addTupple4(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2, Long e3, Long e4);
-
-}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManagerFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManagerFactory.java
deleted file mode 100644
index b8d5b1153e..0000000000
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleManagerFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.core.internal.tuple;
-
-/**
- * @author Angel Avila
- */
-public class TupleManagerFactory {
-
- public static TupleManager createTupleManager(TupleFactory tupleFactory) {
- return new TupleMangerImpl(tupleFactory);
- }
-}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleMangerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleMangerImpl.java
deleted file mode 100644
index 5b59c98c04..0000000000
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/tuple/TupleMangerImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.core.internal.tuple;
-
-import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.orcs.core.ds.TupleData;
-import org.eclipse.osee.orcs.core.internal.transaction.TxData;
-
-/**
- * @author Angel Avila
- */
-public class TupleMangerImpl implements TupleManager {
- private final TupleFactory tupleFactory;
-
- public TupleMangerImpl(TupleFactory tupleFactory) {
- super();
- this.tupleFactory = tupleFactory;
- }
-
- @Override
- public Long addTupple2(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2) {
- TupleData tuple = tupleFactory.createTuple2(tupleTypeId, branch, e1, e2);
- txData.add(tuple);
- return tuple.getVersion().getGammaId();
- }
-
- @Override
- public Long addTupple3(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2, Long e3) {
- TupleData tuple = tupleFactory.createTuple3(tupleTypeId, branch, e1, e2, e3);
- txData.add(tuple);
- return tuple.getVersion().getGammaId();
- }
-
- @Override
- public Long addTupple4(TxData txData, BranchId branch, Long tupleTypeId, Long e1, Long e2, Long e3, Long e4) {
- TupleData tuple = tupleFactory.createTuple4(tupleTypeId, branch, e1, e2, e3, e4);
- txData.add(tuple);
- return tuple.getVersion().getGammaId();
- }
-
-}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
index 78d800034e..b96fca0e74 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectFactoryImpl.java
@@ -205,9 +205,10 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
@Override
public BranchData createCopy(BranchData source) {
- return createBranchData(BranchId.create(source.getId(), source.getViewId()), source.getBranchType(), source.getName(), source.getParentBranch(),
- source.getBaseTransaction(), source.getSourceTransaction(), source.getArchiveState(), source.getBranchState(),
- source.getAssociatedArtifact(), source.isInheritAccessControl());
+ return createBranchData(BranchId.create(source.getId(), source.getViewId()), source.getBranchType(),
+ source.getName(), source.getParentBranch(), source.getBaseTransaction(), source.getSourceTransaction(),
+ source.getArchiveState(), source.getBranchState(), source.getAssociatedArtifact(),
+ source.isInheritAccessControl());
}
@Override
@@ -229,48 +230,30 @@ public class OrcsObjectFactoryImpl implements OrcsObjectFactory {
}
@Override
- public TupleData createTuple2Data(VersionData version, BranchId branchId, Long tupleType, Long element1, Long element2) throws OseeCoreException {
+ public TupleData createTuple2Data(VersionData version, BranchId branch, Long tupleType, Long e1, Long e2) {
TupleData data = new TupleDataImpl(version);
data.setBaseModType(ModificationType.NEW);
data.setModType(ModificationType.NEW);
data.setApplicabilityId(ApplicabilityId.BASE);
data.setTupleType(tupleType);
- data.setElement1(element1);
- data.setElement2(element2);
data.getVersion().setGammaId(Lib.generateUuid());
- data.getVersion().setBranch(branchId);
+ data.getVersion().setBranch(branch);
+ data.setElement1(e1);
+ data.setElement2(e2);
return data;
}
@Override
- public TupleData createTuple3Data(VersionData version, BranchId branchId, Long tupleType, Long e1, Long e2, Long e3) throws OseeCoreException {
- TupleData data = new TupleDataImpl(version);
- data.setBaseModType(ModificationType.NEW);
- data.setModType(ModificationType.NEW);
- data.setApplicabilityId(ApplicabilityId.BASE);
- data.setTupleType(tupleType);
- data.setElement1(e1);
- data.setElement2(e2);
+ public TupleData createTuple3Data(VersionData version, BranchId branch, Long tupleType, Long e1, Long e2, Long e3) {
+ TupleData data = createTuple2Data(version, branch, tupleType, e1, e2);
data.setElement3(e3);
- data.getVersion().setGammaId(Lib.generateUuid());
- data.getVersion().setBranch(branchId);
return data;
}
@Override
- public TupleData createTuple4Data(VersionData version, BranchId branchId, Long tupleType, Long e1, Long e2, Long e3, Long e4) throws OseeCoreException {
- TupleData data = new TupleDataImpl(version);
- data.setBaseModType(ModificationType.NEW);
- data.setModType(ModificationType.NEW);
- data.setApplicabilityId(ApplicabilityId.BASE);
- data.setTupleType(tupleType);
- data.setElement1(e1);
- data.setElement2(e2);
- data.setElement3(e3);
+ public TupleData createTuple4Data(VersionData version, BranchId branch, Long tupleType, Long e1, Long e2, Long e3, Long e4) {
+ TupleData data = createTuple3Data(version, branch, tupleType, e1, e2, e3);
data.setElement4(e4);
- data.getVersion().setGammaId(Lib.generateUuid());
- data.getVersion().setBranch(branchId);
return data;
}
-
-}
+} \ No newline at end of file

Back to the top