Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.osee.define/src')
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/DataRightsImporter.java8
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixDuplicateEnumeratedAttributes.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementReorderOperation.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/HierarchyHandler.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityPage.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java8
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/AddTraceMarksToTraceUnits.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java8
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/CodeUnitData.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/RequirementData.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/TestUnitData.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java8
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java8
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/ImportTraceUnitsOperation.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitFromResourceOperation.java6
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java6
28 files changed, 73 insertions, 73 deletions
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/DataRightsImporter.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/DataRightsImporter.java
index 9b081ffcbb2..66bcdbd056a 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/DataRightsImporter.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/DataRightsImporter.java
@@ -21,7 +21,7 @@ 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.BranchId;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -60,7 +60,7 @@ public class DataRightsImporter extends AbstractBlam {
@Override
public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
- IOseeBranch branch = variableMap.getBranch("Branch");
+ BranchId branch = variableMap.getBranch("Branch");
String xmlPath = variableMap.getString("Path to DataRights XML");
if (branch == null) {
@@ -107,7 +107,7 @@ public class DataRightsImporter extends AbstractBlam {
private final class DataRightsProcessor implements RowProcessor {
- private final IOseeBranch branch;
+ private final BranchId branch;
private boolean ignore;
private int smeIndex;
@@ -117,7 +117,7 @@ public class DataRightsImporter extends AbstractBlam {
private boolean changesAvailable;
private SkynetTransaction transaction;
- public DataRightsProcessor(IOseeBranch branch) {
+ public DataRightsProcessor(BranchId branch) {
super();
this.branch = branch;
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixDuplicateEnumeratedAttributes.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixDuplicateEnumeratedAttributes.java
index 32b2305325b..bc32a058e35 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixDuplicateEnumeratedAttributes.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/FixDuplicateEnumeratedAttributes.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.define.blam.operation;
import java.util.Arrays;
import java.util.Collection;
import org.eclipse.osee.define.blam.operation.FixAttributeOperation.Display;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.OperationLogger;
@@ -50,7 +50,7 @@ public class FixDuplicateEnumeratedAttributes extends AbstractBlam {
@Override
public IOperation createOperation(VariableMap variableMap, OperationLogger logger) throws Exception {
- IOseeBranch branch = variableMap.getBranch(SELECT_BRANCH_LABEL);
+ BranchId branch = variableMap.getBranch(SELECT_BRANCH_LABEL);
boolean commitChangesBool = variableMap.getBoolean(COMMIT_CHANGES_LABEL);
Branch fullBranch = BranchManager.getBranch(branch);
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java
index 2d6c0b298e2..65ae9846c08 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSubsystemToDesignTraceability.java
@@ -16,7 +16,7 @@ import java.util.Collection;
import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -55,7 +55,7 @@ public class PublishSubsystemToDesignTraceability extends AbstractBlam {
monitor.beginTask(getDescriptionUsage(), 100);
List<Artifact> subsystems = variableMap.getArtifacts("Subsystem Root Artifacts");
- IOseeBranch branch = subsystems.get(0).getBranch();
+ BranchId branch = subsystems.get(0).getBranch();
init();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java
index 6160ae1bcc0..5137c61b298 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishSystemLevelSSDD.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -69,7 +69,7 @@ public class PublishSystemLevelSSDD extends AbstractBlam {
public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
monitor.beginTask("Generating System Level SSDD", 100);
- IOseeBranch branch = variableMap.getBranch("Branch");
+ BranchId branch = variableMap.getBranch("Branch");
init();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java
index c84a18256e8..27067c26a2a 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/PublishWithSpecifiedTemplate.java
@@ -22,7 +22,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.ws.rs.core.MediaType;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -62,7 +62,7 @@ import org.json.JSONObject;
*/
public class PublishWithSpecifiedTemplate extends AbstractBlam {
private List<Artifact> templates;
- private IOseeBranch branch;
+ private BranchId branch;
private XBranchSelectWidget branchWidget;
private XCombo slaveWidget;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementReorderOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementReorderOperation.java
index b2026fb6b4b..eaa40e72679 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementReorderOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementReorderOperation.java
@@ -16,7 +16,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -38,7 +38,7 @@ public class RequirementReorderOperation extends AbstractBlam {
@Override
public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
List<Artifact> artifacts = variableMap.getArtifacts("artifacts");
- IOseeBranch branch = artifacts.get(0).getBranch();
+ BranchId branch = artifacts.get(0).getBranch();
transaction = TransactionManager.createTransaction(branch, "Fix Requirement Ordering BLAM");
for (Artifact input : artifacts) {
reorderChildren(input);
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java
index 9e631c80061..fc411feadc4 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemFullTraceReport.java
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.define.traceability.ScriptTraceabilityOperation;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandler;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -92,7 +92,7 @@ public class SubsystemFullTraceReport extends AbstractBlam {
if (artifacts.isEmpty()) {
throw new OseeArgumentException("must specify a set of artifacts");
}
- IOseeBranch branch = artifacts.get(0).getBranch();
+ BranchId branch = artifacts.get(0).getBranch();
init();
String scriptDir = variableMap.getString(SCRIPT_ROOT_DIR);
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java
index abe58a7f5db..5f5b7bac2df 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/SubsystemToLowLevelReqTraceReport.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map.Entry;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -82,7 +82,7 @@ public class SubsystemToLowLevelReqTraceReport extends AbstractBlam {
initLowLevelRequirements(variableMap.getArtifacts("Lower Level Requirements"));
initAllocationComponents(variableMap.getArtifacts("Allocation Components"));
- IOseeBranch branch = lowLevelReqs.get(0).getBranch();
+ BranchId branch = lowLevelReqs.get(0).getBranch();
monitor.subTask("Loading Higher Level Requirements"); // bulk load to improve performance
monitor.worked(1);
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
index fea89f68240..53ee23a3bcf 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.osee.define.internal.Activator;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
@@ -121,7 +121,7 @@ public class ExtractTestRelations {
// link.persist(getClass().getSimpleName());
}
- private Artifact getTestArtifact(IFile testArtifactFile, IOseeBranch branch) throws OseeCoreException {
+ private Artifact getTestArtifact(IFile testArtifactFile, BranchId branch) throws OseeCoreException {
try {
return ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.TestCase, testArtifactFile.getName(),
branch);
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
index 9e879bbe69c..957c1265cfa 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.define.internal.Activator;
import org.eclipse.osee.define.traceability.data.RequirementData;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
@@ -38,7 +38,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
*/
public class BranchTraceabilityOperation extends TraceabilityProviderOperation {
- private final IOseeBranch branch;
+ private final BranchId branch;
private final RequirementData requirementData;
private HashCollection<Artifact, String> requirementToTestUnitsMap;
private Map<String, Artifact> testUnits;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/HierarchyHandler.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/HierarchyHandler.java
index 20b71fb1fac..75533bad744 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/HierarchyHandler.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/HierarchyHandler.java
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -34,7 +34,7 @@ public final class HierarchyHandler {
private static final Matcher subsystemMatcher = Pattern.compile("(\\w*)\\.ss").matcher("");
private final Map<String, Artifact> folderNameToArtifact = new HashMap<>(50);
private final SkynetTransaction transaction;
- private final IOseeBranch branch;
+ private final BranchId branch;
private Artifact root;
public HierarchyHandler(SkynetTransaction transaction) {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityPage.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityPage.java
index b1bb3883a3d..1214deb95ab 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityPage.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityPage.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.define.internal.Activator;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandler;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.plugin.util.DirectoryOrFileSelector;
@@ -217,7 +217,7 @@ public class ImportTraceabilityPage extends WizardDataTransferPage {
return directoryFileSelector.getSingleSelection();
}
- public IOseeBranch getSelectedBranch() {
+ public BranchId getSelectedBranch() {
return branchSelectComposite.getSelectedBranch();
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
index ad2544b3a24..69d15c45fb8 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osee.define.internal.Activator;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandler;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -39,7 +39,7 @@ public class ImportTraceabilityWizard extends Wizard implements IImportWizard {
@Override
public boolean performFinish() {
try {
- IOseeBranch branch = mainPage.getSelectedBranch();
+ BranchId branch = mainPage.getSelectedBranch();
File file = mainPage.getImportFile();
boolean isGitBased = mainPage.isGitBased();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
index be4f6c64a77..e7ed971c3b6 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osee.define.internal.Activator;
import org.eclipse.osee.define.traceability.data.RequirementData;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.operation.Operations;
@@ -42,7 +42,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
* @author Roberto E. Escobar
*/
public class RequirementTraceabilityData {
- private final IOseeBranch testProcedureBranch;
+ private final BranchId testProcedureBranch;
private final TraceabilityProviderOperation traceabilityProvider;
private RequirementData requirementData;
private HashCollection<Artifact, String> requirementsToCodeUnits;
@@ -52,7 +52,7 @@ public class RequirementTraceabilityData {
private final Map<String, Artifact> testProcedures = new HashMap<>();
private File testProcedureFilter;
- public RequirementTraceabilityData(IOseeBranch testProcedureBranch, TraceabilityProviderOperation traceabilityProvider) {
+ public RequirementTraceabilityData(BranchId testProcedureBranch, TraceabilityProviderOperation traceabilityProvider) {
this.testProcedureBranch = testProcedureBranch;
this.traceabilityProvider = traceabilityProvider;
this.testProcedureFilter = null;
@@ -91,7 +91,7 @@ public class RequirementTraceabilityData {
return status;
}
- private void getTestProcedureTraceability(IOseeBranch testProcedureBranch) throws OseeCoreException {
+ private void getTestProcedureTraceability(BranchId testProcedureBranch) throws OseeCoreException {
// Map Software Requirements from TestProcedure IOseeBranch to Requirements IOseeBranch
Map<String, Artifact> testProcedureBranchReqsToReqsBranchMap = new HashMap<>();
for (Artifact tpRequirement : ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.SoftwareRequirement,
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
index 8724b2f5ebd..053b2636568 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
@@ -29,7 +29,7 @@ import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandl
import org.eclipse.osee.define.traceability.data.RequirementData;
import org.eclipse.osee.define.traceability.data.TraceMark;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.jdk.core.type.CountingMap;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
@@ -89,11 +89,11 @@ public class ScriptTraceabilityOperation extends TraceabilityProviderOperation {
excelWriter = new ExcelXmlWriter(charBak.getWriter());
}
- public ScriptTraceabilityOperation(File file, IOseeBranch branch, boolean writeOutResults, Collection<TraceHandler> traceHandlers, boolean isGitBased) throws IOException {
+ public ScriptTraceabilityOperation(File file, BranchId branch, boolean writeOutResults, Collection<TraceHandler> traceHandlers, boolean isGitBased) throws IOException {
this(new RequirementData(branch), file, writeOutResults, traceHandlers, isGitBased);
}
- public ScriptTraceabilityOperation(File file, IOseeBranch branch, boolean writeOutResults, Collection<? extends IArtifactType> types, boolean withInheritance, Collection<TraceHandler> traceHandlers, boolean isGitBased) throws IOException {
+ public ScriptTraceabilityOperation(File file, BranchId branch, boolean writeOutResults, Collection<? extends IArtifactType> types, boolean withInheritance, Collection<TraceHandler> traceHandlers, boolean isGitBased) throws IOException {
this(new RequirementData(branch, types, withInheritance), file, writeOutResults, traceHandlers, isGitBased);
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/AddTraceMarksToTraceUnits.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/AddTraceMarksToTraceUnits.java
index 3005cb54fb8..2043fd01ead 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/AddTraceMarksToTraceUnits.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/AddTraceMarksToTraceUnits.java
@@ -22,7 +22,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.define.traceability.TestUnitTagger;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
@@ -107,7 +107,7 @@ public class AddTraceMarksToTraceUnits extends AbstractBlam {
try {
final URI source = getSourceURI(variableMap);
final boolean isRecursionAllowed = variableMap.getBoolean("Include Sub-Folders");
- IOseeBranch requirementsBranch = variableMap.getBranch("Requirements Branch");
+ BranchId requirementsBranch = variableMap.getBranch("Requirements Branch");
final int TOTAL_WORK = Integer.MAX_VALUE;
monitor.beginTask(getName(), TOTAL_WORK);
@@ -135,7 +135,7 @@ public class AddTraceMarksToTraceUnits extends AbstractBlam {
}
}
- private void processFiles(List<File> files, IOseeBranch branch) throws OseeCoreException {
+ private void processFiles(List<File> files, BranchId branch) throws OseeCoreException {
Matcher matcher = TestUnitTagger.ANNOTATION_PATTERN.matcher("");
for (File file : files) {
String guid = null;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
index eaa4e543e9b..1918b4aca95 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
@@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osee.define.internal.Activator;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
@@ -25,10 +25,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
public abstract class BaseTraceDataCache {
private boolean isInitialized;
- private final IOseeBranch branch;
+ private final BranchId branch;
private final String traceType;
- public BaseTraceDataCache(String traceType, IOseeBranch branch) {
+ public BaseTraceDataCache(String traceType, BranchId branch) {
isInitialized = false;
this.traceType = traceType;
this.branch = branch;
@@ -38,7 +38,7 @@ public abstract class BaseTraceDataCache {
return isInitialized;
}
- public IOseeBranch getBranch() {
+ public BranchId getBranch() {
return branch;
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/CodeUnitData.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/CodeUnitData.java
index fd24f2d2747..9a34da3343e 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/CodeUnitData.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/CodeUnitData.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
import java.util.List;
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.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -27,7 +27,7 @@ public class CodeUnitData extends BaseTraceDataCache {
private final Map<String, Artifact> codeUnitMap;
- public CodeUnitData(IOseeBranch branch) {
+ public CodeUnitData(BranchId branch) {
super("Code Unit Data", branch);
this.codeUnitMap = new HashMap<>();
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/RequirementData.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/RequirementData.java
index 02e2f12d350..a0eccb0b8e9 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/RequirementData.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/RequirementData.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.define.traceability.TraceabilityExtractor;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -38,13 +38,13 @@ public class RequirementData extends BaseTraceDataCache {
private final Collection<? extends IArtifactType> types;
private final boolean withInheritance;
- public RequirementData(IOseeBranch branch, Collection<? extends IArtifactType> types, boolean withInheritance) {
+ public RequirementData(BranchId branch, Collection<? extends IArtifactType> types, boolean withInheritance) {
super("Software Requirements Data", branch);
this.types = types;
this.withInheritance = withInheritance;
}
- public RequirementData(IOseeBranch branch) {
+ public RequirementData(BranchId branch) {
super("Software Requirements Data", branch);
types = Collections.singleton(CoreArtifactTypes.AbstractSoftwareRequirement);
withInheritance = true;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/TestUnitData.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/TestUnitData.java
index a8c5702cb74..0a80e4d3530 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/TestUnitData.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/TestUnitData.java
@@ -18,7 +18,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -37,7 +37,7 @@ public class TestUnitData extends BaseTraceDataCache {
private final HashMap<String, Artifact> testProcedureMap;
private final HashMap<String, Artifact> testSupportMap;
- public TestUnitData(IOseeBranch branch) {
+ public TestUnitData(BranchId branch) {
super("Test Unit Data", branch);
this.testCaseMap = new HashMap<>();
this.testProcedureMap = new HashMap<>();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
index 5023f0c8478..9813eadc9ae 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
@@ -29,7 +29,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.define.internal.Activator;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandler;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.type.MutableBoolean;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -316,7 +316,7 @@ public class ImportTraceUnitPage extends WizardDataTransferPage {
protected boolean validateSourceGroup() {
boolean result = directoryFileSelector.validate(this);
if (result) {
- IOseeBranch branch = getSelectedBranch();
+ BranchId branch = getSelectedBranch();
if (branch == null) {
result = false;
setErrorMessage("Please select a valid working branch");
@@ -350,7 +350,7 @@ public class ImportTraceUnitPage extends WizardDataTransferPage {
return toReturn;
}
- public IOseeBranch getSelectedBranch() {
+ public BranchId getSelectedBranch() {
return isWidgetAccessible(branchSelectComposite) ? branchSelectComposite.getSelectedBranch() : null;
}
@@ -443,7 +443,7 @@ public class ImportTraceUnitPage extends WizardDataTransferPage {
super.saveWidgetValues();
IDialogSettings settings = getDialogSettings();
if (settings != null) {
- IOseeBranch branch = getSelectedBranch();
+ BranchId branch = getSelectedBranch();
if (branch != null) {
try {
settings.put(BRANCH_KEY, branch.getUuid());
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
index fee45ac2de0..a41e33f52f9 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osee.define.internal.Activator;
import org.eclipse.osee.define.traceability.operations.ImportTraceUnitsOperation;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.logging.OseeLevel;
@@ -38,7 +38,7 @@ public class ImportTraceUnitWizard extends Wizard implements IImportWizard {
@Override
public boolean performFinish() {
try {
- IOseeBranch importToBranch = page.getSelectedBranch();
+ BranchId importToBranch = page.getSelectedBranch();
boolean isRecursive = page.isFolderRecursionAllowed();
boolean isPersistChanges = page.isArtifactPersistanceAllowed();
Iterable<URI> sources = page.getSourceURI();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
index 4d6b5f3545f..1571482dcdc 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.osee.define.internal.Activator;
import org.eclipse.osee.define.traceability.operations.FindTraceUnitFromResource;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable;
import org.eclipse.osee.framework.plugin.core.util.Jobs;
import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog;
@@ -49,7 +49,7 @@ public class FindTraceUnitJob extends Job {
@Override
public void done(IJobChangeEvent event) {
FetchBranchJob fetcherJob = (FetchBranchJob) event.getJob();
- final IOseeBranch branch = fetcherJob.getSelectedBranch();
+ final BranchId branch = fetcherJob.getSelectedBranch();
if (branch != null) {
IExceptionableRunnable runnable = new IExceptionableRunnable() {
@@ -67,7 +67,7 @@ public class FindTraceUnitJob extends Job {
return Status.OK_STATUS;
}
private static final class FetchBranchJob extends UIJob {
- private IOseeBranch branch;
+ private BranchId branch;
public FetchBranchJob(String name) {
super(name);
@@ -79,7 +79,7 @@ public class FindTraceUnitJob extends Job {
return Status.OK_STATUS;
}
- public IOseeBranch getSelectedBranch() {
+ public BranchId getSelectedBranch() {
return branch;
}
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
index ca17368d4eb..1e42a7691a5 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
@@ -26,7 +26,7 @@ import org.eclipse.osee.define.traceability.ITraceUnitResourceLocator;
import org.eclipse.osee.define.traceability.ResourceIdentifier;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
@@ -95,7 +95,7 @@ public final class FindTraceUnitFromResource {
}
}
- public static void search(IOseeBranch branch, IResource... resources) {
+ public static void search(BranchId branch, IResource... resources) {
HashCollection<IArtifactType, ResourceIdentifier> typeAndIds = toIdentifiers(resources);
if (!typeAndIds.isEmpty()) {
Set<Artifact> artifacts = new HashSet<>();
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/ImportTraceUnitsOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/ImportTraceUnitsOperation.java
index c63889b1010..3304fd531bc 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/ImportTraceUnitsOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/ImportTraceUnitsOperation.java
@@ -16,7 +16,7 @@ import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.nebula.widgets.xviewer.Activator;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -24,7 +24,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
* @author Roberto E. Escobar
*/
public class ImportTraceUnitsOperation extends AbstractOperation {
- private final IOseeBranch importToBranch;
+ private final BranchId importToBranch;
private final boolean isRecursive;
private final boolean isPersistChanges;
private final boolean fileWithMultiPaths;
@@ -32,7 +32,7 @@ public class ImportTraceUnitsOperation extends AbstractOperation {
private final Iterable<URI> sources;
private final String[] traceTypeIds;
- public ImportTraceUnitsOperation(String jobName, IOseeBranch importToBranch, Iterable<URI> sources, boolean isRecursive, boolean isPersistChanges, boolean fileWithMultiPaths, boolean addGuidToSourceFile, String... traceHandlerIds) {
+ public ImportTraceUnitsOperation(String jobName, BranchId importToBranch, Iterable<URI> sources, boolean isRecursive, boolean isPersistChanges, boolean fileWithMultiPaths, boolean addGuidToSourceFile, String... traceHandlerIds) {
super("ImportTraceUnitsOperation", Activator.PLUGIN_ID);
this.importToBranch = importToBranch;
this.sources = sources;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java
index 34f5ca190f1..69987e3ad2f 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceResourceDropOperation.java
@@ -29,7 +29,7 @@ import org.eclipse.nebula.widgets.xviewer.Activator;
import org.eclipse.osee.define.traceability.HierarchyHandler;
import org.eclipse.osee.define.traceability.TestUnitTagger;
import org.eclipse.osee.define.utility.IResourceLocator;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
@@ -73,7 +73,7 @@ public class TraceResourceDropOperation extends AbstractOperation {
@Override
protected void doWork(IProgressMonitor monitor) throws Exception {
if (!resources.isEmpty()) {
- IOseeBranch branch = requirement.getBranch();
+ BranchId branch = requirement.getBranch();
SkynetTransaction transaction = null;
if (persistChanges) {
transaction = TransactionManager.createTransaction(branch, "TraceResourceDrop");
@@ -117,7 +117,7 @@ public class TraceResourceDropOperation extends AbstractOperation {
TestUnitTagger tagger = TestUnitTagger.getInstance();
String tag = tagger.getSourceTag(fileUri);
Artifact testUnitArtifact = null;
- IOseeBranch branch = requirement.getBranch();
+ BranchId branch = requirement.getBranch();
boolean tagSource = false;
if (GUID.isValid(tag)) {
try {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitFromResourceOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitFromResourceOperation.java
index 7f6b5043533..53f710402d0 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitFromResourceOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitFromResourceOperation.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandler;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -64,7 +64,7 @@ public class TraceUnitFromResourceOperation {
operation.execute(monitor);
}
- public static void importTraceFromTestUnits(IProgressMonitor monitor, Iterable<URI> sources, boolean isRecursive, boolean isFileWithMultiplePaths, IOseeBranch importToBranch, boolean addGuidToSourceFile, String... traceUnitHandlerIds) throws OseeCoreException {
+ public static void importTraceFromTestUnits(IProgressMonitor monitor, Iterable<URI> sources, boolean isRecursive, boolean isFileWithMultiplePaths, BranchId importToBranch, boolean addGuidToSourceFile, String... traceUnitHandlerIds) throws OseeCoreException {
checkBranchArguments(importToBranch);
ResourceToTraceUnit operation =
@@ -112,7 +112,7 @@ public class TraceUnitFromResourceOperation {
}
}
- private static void checkBranchArguments(IOseeBranch importToBranch) throws OseeCoreException {
+ private static void checkBranchArguments(BranchId importToBranch) throws OseeCoreException {
if (importToBranch == null) {
throw new OseeArgumentException("Branch to import into was null");
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
index 57d86c94027..8d47a287b3f 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
@@ -34,7 +34,7 @@ import org.eclipse.osee.define.traceability.data.TestUnitData;
import org.eclipse.osee.define.traceability.data.TraceMark;
import org.eclipse.osee.define.traceability.data.TraceUnit;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
+import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -69,7 +69,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor {
private TestUnitData testUnitData;
private final boolean addGuidToSourceFile;
- private final IOseeBranch importIntoBranch;
+ private final BranchId importIntoBranch;
private SkynetTransaction transaction;
private HierarchyHandler handler;
@@ -77,7 +77,7 @@ public class TraceUnitToArtifactProcessor implements ITraceUnitProcessor {
private final HashCollection<String, String> unknownRelationError;
private final Set<String> unRelatedUnits;
- public TraceUnitToArtifactProcessor(IOseeBranch importIntoBranch, boolean addGuidToSourceFile) {
+ public TraceUnitToArtifactProcessor(BranchId importIntoBranch, boolean addGuidToSourceFile) {
this.importIntoBranch = importIntoBranch;
this.reportTraceNotFound = new HashCollection<>(false, HashSet.class);
this.unknownRelationError = new HashCollection<>(false, HashSet.class);

Back to the top