Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-01-06 18:39:44 +0000
committerRyan D. Brooks2016-01-06 18:39:44 +0000
commitc61d5c2934e3c265af12516e32954d19480039fc (patch)
treeeb6988e3b17b74ba94a7123163334703997bc5bd /plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org
parent491e33655af14eb3e0e19c3e68bfb4377eb26efa (diff)
downloadorg.eclipse.osee-c61d5c2934e3c265af12516e32954d19480039fc.tar.gz
org.eclipse.osee-c61d5c2934e3c265af12516e32954d19480039fc.tar.xz
org.eclipse.osee-c61d5c2934e3c265af12516e32954d19480039fc.zip
refactor: Remove unnecessary code from BranchManager
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org')
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
index cd7f8155b44..580c71097e0 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslArtifactUpdateOperation.java
@@ -16,16 +16,16 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.dsl.integration.util.OseeDslSegmentParser;
import org.eclipse.osee.framework.core.dsl.integration.util.OseeDslSegmentParser.OseeDslSegment;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
@@ -54,7 +54,7 @@ public class OseeDslArtifactUpdateOperation extends AbstractOperation {
double workPercentage = 0.80 * 1.0 / segments.size();
int workAmount = calculateWork(workPercentage);
- Map<Branch, SkynetTransaction> transactionMap = new HashMap<>();
+ Map<IOseeBranch, SkynetTransaction> transactionMap = new HashMap<>();
for (OseeDslSegment segment : segments) {
int startAt = segment.start();
int endAt = segment.end();
@@ -75,8 +75,8 @@ public class OseeDslArtifactUpdateOperation extends AbstractOperation {
return Lib.fileToString(file);
}
- protected void addChanges(Map<Branch, SkynetTransaction> transactionMap, long branchUuid, String artifactGuid, String data) throws OseeCoreException {
- Branch branch = BranchManager.getBranchByGuid(branchUuid);
+ protected void addChanges(Map<IOseeBranch, SkynetTransaction> transactionMap, long branchId, String artifactGuid, String data) throws OseeCoreException {
+ IOseeBranch branch = TokenFactory.createBranch(branchId);
SkynetTransaction transaction = transactionMap.get(branch);
if (transaction == null) {
transaction = TransactionManager.createTransaction(branch, "OseeDslArtifactUpdate");

Back to the top