Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-09-28 00:53:37 -0400
committerAngel Avila2016-10-04 21:35:44 -0400
commit31cec27446ddc683dd7d34b551b709cac21bca6d (patch)
tree490a56ab22fbbfc67896d0e53dd86724dec9af0e
parent5782b533d6b1213a89677b8d58f7cc88d8ebbee5 (diff)
downloadorg.eclipse.osee-31cec27446ddc683dd7d34b551b709cac21bca6d.tar.gz
org.eclipse.osee-31cec27446ddc683dd7d34b551b709cac21bca6d.tar.xz
org.eclipse.osee-31cec27446ddc683dd7d34b551b709cac21bca6d.zip
refactor: Move RelationSorter to enum package
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java4
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java11
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java19
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java12
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java2
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java17
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java14
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java13
-rw-r--r--plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java7
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationOrderBaseTypes.java24
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationSorter.java (renamed from plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationSorter.java)2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java21
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java20
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java10
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java20
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java22
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeWorker.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java11
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java7
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java17
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java8
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java6
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java47
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java32
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProviderTest.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterTest.java21
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java15
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderData.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/LexicographicalSorter.java9
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/Sorter.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UnorderedSorter.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedSorter.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java2
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java2
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java2
69 files changed, 270 insertions, 292 deletions
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
index 502d920b372..2af57504399 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/artifact/CollectorArtifact.java
@@ -10,11 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.ats.core.client.artifact;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -33,7 +33,7 @@ public abstract class CollectorArtifact extends AbstractWorkflowArtifact impleme
@Override
public void addMember(Artifact artifact) throws OseeCoreException {
if (!getMembers().contains(artifact)) {
- addRelation(RelationOrderBaseTypes.USER_DEFINED, membersRelationType, artifact);
+ addRelation(USER_DEFINED, membersRelationType, artifact);
}
}
diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
index 473a7990aba..1ab18497445 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/util/AtsChangeSet.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.ats.core.client.util;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -38,7 +39,6 @@ import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionId;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -313,7 +313,7 @@ public class AtsChangeSet extends AbstractAtsChangeSet {
add(art);
}
}
- artifact.setRelations(RelationOrderBaseTypes.PREEXISTING, relationSide, artifacts);
+ artifact.setRelations(PREEXISTING, relationSide, artifacts);
add(artifact);
}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java
index 38f64d1b958..cc18da4931c 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java
@@ -12,7 +12,9 @@ package org.eclipse.osee.client.integration.tests.integration.skynet.core;
import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.Artifact;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.List;
import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.TestUtil;
import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
@@ -20,11 +22,10 @@ import org.eclipse.osee.client.test.framework.OseeHousekeepingRule;
import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -57,8 +58,8 @@ public class RelationOrderMergeUtilityTest {
public final OseeHousekeepingRule oseeHousekeeping = new OseeHousekeepingRule();
private final IRelationTypeSide defaultHierarchy = CoreRelationTypes.Default_Hierarchical__Child;
- private final RelationSorter ascOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
- private final RelationSorter descOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+ private final RelationSorter ascOrder = LEXICOGRAPHICAL_ASC;
+ private final RelationSorter descOrder = LEXICOGRAPHICAL_DESC;
private RelationType hierType;
private RelationSide hierSide;
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java
index 06bd1709cea..353a30468c8 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderingTest.java
@@ -11,6 +11,8 @@
package org.eclipse.osee.client.integration.tests.integration.skynet.core;
import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@@ -25,7 +27,6 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts;
@@ -109,8 +110,7 @@ public class RelationOrderingTest {
checkUserDefined();
- parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child,
- RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
+ parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child, LEXICOGRAPHICAL_ASC);
Attribute<Object> attribute = parent.getSoleAttribute(CoreAttributeTypes.RelationOrder);
assertTrue("Setting the attribute back to the default type did not cause an attribute to be deleted",
attribute == null || attribute.isDeleted());
@@ -141,12 +141,11 @@ public class RelationOrderingTest {
parent.addRelation(CoreRelationTypes.Users_User, child6);
parent.persist(transaction);
- parent.setRelationOrder(CoreRelationTypes.Users_User, RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ parent.setRelationOrder(CoreRelationTypes.Users_User, LEXICOGRAPHICAL_DESC);
- parent.setRelationOrder(CoreRelationTypes.Users_Artifact, RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ parent.setRelationOrder(CoreRelationTypes.Users_Artifact, LEXICOGRAPHICAL_DESC);
- parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child,
- RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
+ parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child, LEXICOGRAPHICAL_ASC);
transaction.execute();
attribute = parent.getSoleAttribute(CoreAttributeTypes.RelationOrder);
@@ -156,8 +155,7 @@ public class RelationOrderingTest {
}
private void checkAsc() throws OseeCoreException {
- parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child,
- RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
+ parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child, LEXICOGRAPHICAL_ASC);
List<Artifact> children = parent.getRelatedArtifacts(CoreRelationTypes.Default_Hierarchical__Child);
Assert.assertEquals(3, children.size());
Assert.assertEquals(children.get(0).getName(), "a_child");
@@ -166,8 +164,7 @@ public class RelationOrderingTest {
}
private void checkDesc() throws OseeCoreException {
- parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child,
- RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ parent.setRelationOrder(CoreRelationTypes.Default_Hierarchical__Child, LEXICOGRAPHICAL_DESC);
List<Artifact> children = parent.getRelatedArtifacts(CoreRelationTypes.Default_Hierarchical__Child);
Assert.assertEquals(3, children.size());
Assert.assertEquals(children.get(0).getName(), "c_child");
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java
index aacb7d67c49..ac734d55d84 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.client.integration.tests.integration.skynet.core.utils;
import static org.eclipse.osee.framework.core.enums.DemoBranches.SAW_Bld_1;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
@@ -25,7 +26,6 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -164,11 +164,11 @@ public class ConflictTestManager {
// Add artifacts onto the destination Branch
for (int i = 0; i < NUMBER_OF_ARTIFACTS; i++) {
if (conflictDefs[i].rootArtifact > 0 && conflictDefs[i].rootArtifact < i) {
- destArtifacts[i] = destArtifacts[conflictDefs[i].rootArtifact].addNewChild(
- RelationOrderBaseTypes.USER_DEFINED, conflictDefs[i].artifactType, "Test Artifact Number " + i);
- } else {
- destArtifacts[i] = rootArtifact.addNewChild(RelationOrderBaseTypes.USER_DEFINED,
+ destArtifacts[i] = destArtifacts[conflictDefs[i].rootArtifact].addNewChild(USER_DEFINED,
conflictDefs[i].artifactType, "Test Artifact Number " + i);
+ } else {
+ destArtifacts[i] =
+ rootArtifact.addNewChild(USER_DEFINED, conflictDefs[i].artifactType, "Test Artifact Number " + i);
}
for (AttributeValue value : conflictDefs[i].newAttributes) {
destArtifacts[i].addAttribute(value.attributeType, stringToObject(value.clas, value.sourceValue));
@@ -303,7 +303,7 @@ public class ConflictTestManager {
rootArtifact = sourceArtifacts[rootArtifactId];
}
}
- Artifact child = rootArtifact.addNewChild(RelationOrderBaseTypes.USER_DEFINED, type, name);
+ Artifact child = rootArtifact.addNewChild(USER_DEFINED, type, name);
child.persist(ConflictTestManager.class.getSimpleName());
rootArtifact.persist(ConflictTestManager.class.getSimpleName());
return child;
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java
index 36cfbe7eb6c..85414c5cf23 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/TestUtil.java
@@ -18,12 +18,12 @@ import java.util.Map;
import java.util.Random;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.ModificationType;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java
index f1823e4e161..0cff7cd45a4 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java
@@ -12,17 +12,17 @@ package org.eclipse.osee.client.integration.tests.integration.ui.skynet;
import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map.Entry;
import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
@@ -107,7 +107,7 @@ public class ArtifactPasteOperationTest {
String resolvedName = "Empty Parent First";
try {
performPaste(false, true, destination, Arrays.asList(parent1), resolvedName);
- checkPaste(destination, resolvedName, parent1, RelationOrderBaseTypes.USER_DEFINED);
+ checkPaste(destination, resolvedName, parent1, USER_DEFINED);
} finally {
Artifact toDelete = destination.getChild(resolvedName);
delete(toDelete);
@@ -119,11 +119,11 @@ public class ArtifactPasteOperationTest {
String resolvedName = "Parent No Children";
try {
performPaste(false, true, destination, Arrays.asList(parent1), resolvedName);
- checkPaste(destination, resolvedName, parent1, RelationOrderBaseTypes.USER_DEFINED);
+ checkPaste(destination, resolvedName, parent1, USER_DEFINED);
Artifact newArtifact = destination.getChild(resolvedName);
performPaste(false, true, newArtifact, Arrays.asList(child1), null);
- checkPaste(newArtifact, child1.getName(), child1, RelationOrderBaseTypes.USER_DEFINED);
+ checkPaste(newArtifact, child1.getName(), child1, USER_DEFINED);
} finally {
Artifact toDelete = destination.getChild(resolvedName);
@@ -137,8 +137,7 @@ public class ArtifactPasteOperationTest {
String resolvedName = "Parent With Children";
try {
performPaste(true, true, destination, Arrays.asList(parent1), resolvedName);
- checkPaste(destination, resolvedName, parent1, RelationOrderBaseTypes.USER_DEFINED, "child_a", "child_c",
- "child_b");
+ checkPaste(destination, resolvedName, parent1, USER_DEFINED, "child_a", "child_c", "child_b");
} finally {
Artifact toDelete = destination.getChild(resolvedName);
delete(toDelete);
@@ -170,7 +169,7 @@ public class ArtifactPasteOperationTest {
Assert.assertTrue(childArtifacts.isEmpty());
}
checkRelationOrder(newArtifact, expectedOrderType, hasChildren);
- checkRelationOrder(destination, RelationOrderBaseTypes.USER_DEFINED, true);
+ checkRelationOrder(destination, USER_DEFINED, true);
}
private void checkRelationOrder(Artifact artifactToCheck, RelationSorter expectedOrderType, boolean hasChildren) throws OseeCoreException {
@@ -188,7 +187,7 @@ public class ArtifactPasteOperationTest {
Assert.assertEquals(CoreRelationTypes.Default_Hierarchical__Child.getName(), relationType);
Assert.assertEquals(RelationSide.SIDE_B.name(), relationSide);
Assert.assertEquals(expectedOrderType, orderGuid);
- if (hasChildren && expectedOrderType == RelationOrderBaseTypes.USER_DEFINED) {
+ if (hasChildren && expectedOrderType == USER_DEFINED) {
Assert.assertEquals(childArtifacts.size(), guids.size());
for (int index = 0; index < guids.size(); index++) {
IArtifact orderedChild = childArtifacts.get(index);
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java
index af3b34f9d27..649b45d87fc 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java
@@ -12,6 +12,9 @@ package org.eclipse.osee.client.integration.tests.integration.ui.skynet;
import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
import static org.eclipse.osee.framework.core.enums.DemoBranches.SAW_Bld_1;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -24,13 +27,12 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -100,8 +102,8 @@ public final class ReplaceWithBaselineTest {
@Rule
public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule();
- private static final RelationSorter ascOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
- private static final RelationSorter descOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+ private static final RelationSorter ascOrder = LEXICOGRAPHICAL_ASC;
+ private static final RelationSorter descOrder = LEXICOGRAPHICAL_DESC;
/**
* Refer to table for Case 10*
@@ -260,7 +262,7 @@ public final class ReplaceWithBaselineTest {
testData.setbArtifactId(child.getArtId());
testData.setcArtId(newParent.getArtId());
- parent.addChild(RelationOrderBaseTypes.USER_DEFINED, child);
+ parent.addChild(USER_DEFINED, child);
parent.persist(testName);
@@ -413,7 +415,7 @@ public final class ReplaceWithBaselineTest {
parent.deleteRelations(CoreRelationTypes.Default_Hierarchical__Child);
parent.persist(testName);
- newParent.addChild(RelationOrderBaseTypes.USER_DEFINED, child);
+ newParent.addChild(USER_DEFINED, child);
newParent.persist(testName);
//This is to revert the child artifact
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java
index 30f309d92fa..331c3ae0469 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/WordTemplateRendererTest.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.client.integration.tests.integration.ui.skynet;
import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -23,10 +24,8 @@ import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
import org.eclipse.osee.client.test.framework.TestInfo;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -698,11 +697,11 @@ public class WordTemplateRendererTest {
Artifact ventReq = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, branch, "Ventilation");
swReqFolder.addChild(crewReq);
- crewReq.addChild(RelationOrderBaseTypes.USER_DEFINED, commReq);
- crewReq.addChild(RelationOrderBaseTypes.USER_DEFINED, navReq);
- crewReq.addChild(RelationOrderBaseTypes.USER_DEFINED, airReq);
- airReq.addChild(RelationOrderBaseTypes.USER_DEFINED, airDrawReq);
- airReq.addChild(RelationOrderBaseTypes.USER_DEFINED, ventReq);
+ crewReq.addChild(USER_DEFINED, commReq);
+ crewReq.addChild(USER_DEFINED, navReq);
+ crewReq.addChild(USER_DEFINED, airReq);
+ airReq.addChild(USER_DEFINED, airDrawReq);
+ airReq.addChild(USER_DEFINED, ventReq);
commReq.setSoleAttributeValue(CoreAttributeTypes.WordTemplateContent,
beginWordString + "This is the list of Communication crew station requirements." + endWordString);
diff --git a/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java b/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java
index becebcf30da..866dba7fb94 100644
--- a/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java
+++ b/plugins/org.eclipse.osee.doors.connector.ui/src/org/eclipse/osee/doors/connector/ui/handler/DoorsCreator.java
@@ -5,13 +5,13 @@
*/
package org.eclipse.osee.doors.connector.ui.handler;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -55,8 +55,7 @@ public class DoorsCreator {
Artifact rootArtifact = ArtifactQuery.checkArtifactFromTypeAndName(CoreArtifactTypes.RootArtifact,
"Default Hierarchy Root", branch);
if (rootArtifact != null) {
- parentArtifact = rootArtifact.addNewChild(RelationOrderBaseTypes.PREEXISTING, CoreArtifactTypes.Folder,
- "Door Requirements");
+ parentArtifact = rootArtifact.addNewChild(PREEXISTING, CoreArtifactTypes.Folder, "Door Requirements");
}
}
@@ -65,7 +64,7 @@ public class DoorsCreator {
Artifact artifact =
ArtifactQuery.checkArtifactFromTypeAndName(DoorsArtifactType.Doors_Artifact, reqName, branch);
if (artifact == null) {
- newArtifact = parentArtifact.addNewChild(RelationOrderBaseTypes.PREEXISTING,
+ newArtifact = parentArtifact.addNewChild(PREEXISTING,
TokenFactory.createArtifactType(0x5000000000002001L, "DoorsRequirement"), reqName);
newArtifact.setSoleAttributeFromString(
TokenFactory.createAttributeType(0x5000000000002003L, "Door Req Name"), reqName);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
index fc530f932b5..a63f806248a 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.dsl.integration.internal;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -34,7 +35,6 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
@@ -360,6 +360,6 @@ public class RelationTypeRestrictionHandlerTest extends BaseRestrictionHandlerTe
private static RelationType getTestRelationType(IRelationType relationType, IArtifactType aArtTypeToken, IArtifactType bArtTypeToken) {
return new RelationType(relationType.getId(), relationType.getName(), "sideA_" + aArtTypeToken.getName(),
"sideB_" + bArtTypeToken.getName(), aArtTypeToken, bArtTypeToken, RelationTypeMultiplicity.MANY_TO_MANY,
- RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
+ LEXICOGRAPHICAL_ASC);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java
index 25540c15003..a55dcf98fe1 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java
@@ -15,10 +15,10 @@ import java.util.Random;
import org.eclipse.osee.framework.core.data.IAccessContextId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.PermissionEnum;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.enums.TransactionDetailsType;
import org.eclipse.osee.framework.core.model.OseeEnumEntry;
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java
index ad631b8daae..9014735b0ef 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationType.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.framework.core.model.type;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.AbstractOseeIdType;
import org.eclipse.osee.framework.core.model.OseeField;
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java
index c3ad27f2584..d1c1953a3a0 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/type/RelationTypeFactory.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.core.model.type;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.cache.IOseeTypeFactory;
import org.eclipse.osee.framework.core.model.cache.RelationTypeCache;
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationOrderBaseTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationOrderBaseTypes.java
deleted file mode 100644
index d220ffacbba..00000000000
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationOrderBaseTypes.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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:
- *public static final CoreAttributeTypes Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.enums;
-
-import org.eclipse.osee.framework.core.data.RelationSorter;
-
-/**
- * @author Andrew M. Finkbeiner
- */
-public class RelationOrderBaseTypes {
- public static final RelationSorter USER_DEFINED = RelationSorter.USER_DEFINED;
- public static final RelationSorter LEXICOGRAPHICAL_ASC = RelationSorter.LEXICOGRAPHICAL_ASC;
- public static final RelationSorter LEXICOGRAPHICAL_DESC = RelationSorter.LEXICOGRAPHICAL_DESC;
- public static final RelationSorter UNORDERED = RelationSorter.UNORDERED;
- public static final RelationSorter PREEXISTING = RelationSorter.PREEXISTING;
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationSorter.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationSorter.java
index bc092642dc2..8ff316d6793 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationSorter.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationSorter.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.core.data;
+package org.eclipse.osee.framework.core.enums;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
index 2e35ff05b2f..f197dcbbb9f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java
@@ -11,6 +11,10 @@
package org.eclipse.osee.framework.skynet.core.relation;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -23,12 +27,11 @@ import java.util.Random;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
@@ -131,7 +134,7 @@ public class RelationTypeSideSorterTest {
Assert.assertFalse(actual.equals(expected));
// Set Different sorter id
- sorter.setOrder(relatives, RelationOrderBaseTypes.USER_DEFINED);
+ sorter.setOrder(relatives, USER_DEFINED);
actual = orderData.getOrderList(sorter.getRelationType(), sorter.getSide());
expected = Artifacts.toGuids(relatives);
Assert.assertTrue(actual.equals(expected));
@@ -155,7 +158,7 @@ public class RelationTypeSideSorterTest {
RelationSorter sorterId = relationSorter.getSorterId();
List<IArtifact> itemsToOrder = new ArrayList<>(startingArtifacts);
itemsToOrder.add(itemToAdd);
- if (RelationOrderBaseTypes.USER_DEFINED != sorterId) {
+ if (USER_DEFINED != sorterId) {
relationSorter.sort(itemsToOrder, null);
}
@@ -164,7 +167,7 @@ public class RelationTypeSideSorterTest {
sorter.addItem(sorterId, itemToAdd);
List<String> currentOrder = orderData.getOrderList(sorter.getRelationType(), sorter.getSide());
- if (RelationOrderBaseTypes.USER_DEFINED != sorterId) {
+ if (USER_DEFINED != sorterId) {
Assert.assertTrue(currentOrder.isEmpty());
} else {
List<String> expectedOrder = Artifacts.toGuids(itemsToOrder);
@@ -191,8 +194,8 @@ public class RelationTypeSideSorterTest {
RelationTypeCache cache = new RelationTypeCache();
- RelationType relationType1 = createRelationType(cache, "Rel 1", RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
- RelationType relationType2 = createRelationType(cache, "Rel 2", RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ RelationType relationType1 = createRelationType(cache, "Rel 1", LEXICOGRAPHICAL_ASC);
+ RelationType relationType2 = createRelationType(cache, "Rel 2", LEXICOGRAPHICAL_DESC);
IArtifact art1 = createArtifact("a", GUID.create());
IArtifact art2 = createArtifact("b", GUID.create());
@@ -230,9 +233,9 @@ public class RelationTypeSideSorterTest {
private static void addData(RelationTypeCache cache, RelationOrderData data, List<Object[]> expected) throws OseeCoreException {
addData(data, expected, cache.getUniqueByName("Rel 1"), RelationSide.SIDE_A, //
- RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, "1", "2", "3");
+ LEXICOGRAPHICAL_ASC, "1", "2", "3");
addData(data, expected, cache.getUniqueByName("Rel 2"), RelationSide.SIDE_B, //
- RelationOrderBaseTypes.UNORDERED, "4", "5", "6");
+ UNORDERED, "4", "5", "6");
checkData(data, expected);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
index 38667182ef7..d7c8c2a4a5b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderDataTest.java
@@ -10,17 +10,19 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.order;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map.Entry;
import java.util.Random;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.model.cache.RelationTypeCache;
@@ -61,9 +63,9 @@ public class RelationOrderDataTest {
RelationTypeCache cache = new RelationTypeCache();
- relationType1 = createRelationType(cache, "Rel 1", RelationOrderBaseTypes.USER_DEFINED);
- relationType2 = createRelationType(cache, "Rel 2", RelationOrderBaseTypes.UNORDERED);
- relationType3 = createRelationType(cache, "Rel 3", RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
+ relationType1 = createRelationType(cache, "Rel 1", USER_DEFINED);
+ relationType2 = createRelationType(cache, "Rel 2", UNORDERED);
+ relationType3 = createRelationType(cache, "Rel 3", LEXICOGRAPHICAL_ASC);
Assert.assertFalse(data.hasEntries());
Assert.assertEquals(0, data.size());
@@ -130,10 +132,10 @@ public class RelationOrderDataTest {
}
RelationSorter actualGuid = data.getCurrentSorterGuid(relationType1, RelationSide.SIDE_A);
- Assert.assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, actualGuid);
+ Assert.assertEquals(LEXICOGRAPHICAL_ASC, actualGuid);
actualGuid = data.getCurrentSorterGuid(relationType2, RelationSide.SIDE_B);
- Assert.assertEquals(RelationOrderBaseTypes.UNORDERED, actualGuid);
+ Assert.assertEquals(UNORDERED, actualGuid);
// Pair does not exist
actualGuid = data.getCurrentSorterGuid(relationType2, RelationSide.SIDE_A);
@@ -211,7 +213,7 @@ public class RelationOrderDataTest {
// No Change -- Current Sorter Id
List<IArtifact> emptyList = java.util.Collections.emptyList();
- data.store(relationType1, RelationSide.SIDE_A, RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, emptyList);
+ data.store(relationType1, RelationSide.SIDE_A, LEXICOGRAPHICAL_ASC, emptyList);
Assert.assertFalse(accessor.wasStoreCalled());
// Store
@@ -221,7 +223,7 @@ public class RelationOrderDataTest {
// Store
accessor.clearStoreCalled();
- data.store(relationType1, RelationSide.SIDE_A, RelationOrderBaseTypes.UNORDERED, emptyList);
+ data.store(relationType1, RelationSide.SIDE_A, UNORDERED, emptyList);
Assert.assertTrue(accessor.wasStoreCalled());
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java
index 8b83093b591..43b59ed3419 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParserTest.java
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.order;
-import static org.eclipse.osee.framework.core.data.RelationSorter.USER_DEFINED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java
index ed115d7eb87..be40f627e73 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProviderTest.java
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.order;
-import static org.eclipse.osee.framework.core.data.RelationSorter.LEXICOGRAPHICAL_ASC;
-import static org.eclipse.osee.framework.core.data.RelationSorter.LEXICOGRAPHICAL_DESC;
-import static org.eclipse.osee.framework.core.data.RelationSorter.UNORDERED;
-import static org.eclipse.osee.framework.core.data.RelationSorter.USER_DEFINED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java
index 070c828ba28..da954424fd5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/sorters/RelationSorterTest.java
@@ -10,12 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.sorters;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.mocks.DataFactory;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
@@ -93,13 +96,7 @@ public class RelationSorterTest {
IArtifact art4 = DataFactory.createArtifact(names[3], GUID.create());
List<IArtifact> artifacts = Arrays.asList(art1, art2, art3, art4);
- return new Object[] {
- "Unordered Test",
- new UnorderedRelationSorter(),
- RelationOrderBaseTypes.UNORDERED,
- null,
- artifacts,
- artifacts};
+ return new Object[] {"Unordered Test", new UnorderedRelationSorter(), UNORDERED, null, artifacts, artifacts};
}
private static Object[] createLexicographicalTest(SortMode mode, String... names) {
@@ -108,8 +105,7 @@ public class RelationSorterTest {
IArtifact art3 = DataFactory.createArtifact(names[2], GUID.create());
IArtifact art4 = DataFactory.createArtifact(names[3], GUID.create());
- RelationSorter orderId =
- mode == SortMode.ASCENDING ? RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC : RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+ RelationSorter orderId = mode == SortMode.ASCENDING ? LEXICOGRAPHICAL_ASC : LEXICOGRAPHICAL_DESC;
List<IArtifact> itemsToOrder = Arrays.asList(art3, art1, art4, art2);
List<IArtifact> expectedOrder = Arrays.asList(art1, art2, art3, art4);
@@ -134,7 +130,7 @@ public class RelationSorterTest {
return new Object[] {
"UserDefined",
new UserDefinedRelationSorter(),
- RelationOrderBaseTypes.USER_DEFINED,
+ USER_DEFINED,
relatives,
itemsToOrder,
expectedOrder};
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index b8c0f1c6383..89aaf702d03 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -12,6 +12,8 @@
package org.eclipse.osee.framework.skynet.core.artifact;
import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Default_Hierarchical__Child;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -25,13 +27,12 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.regex.Pattern;
import org.eclipse.osee.framework.core.data.Adaptable;
+import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.ArtifactTypeId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.ArtifactToken;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.TransactionToken;
@@ -41,8 +42,8 @@ import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.EditState;
import org.eclipse.osee.framework.core.enums.LoadLevel;
import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.AttributeDoesNotExist;
@@ -430,7 +431,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
}
public final void addChild(Artifact artifact) throws OseeCoreException {
- addChild(RelationOrderBaseTypes.PREEXISTING, artifact);
+ addChild(PREEXISTING, artifact);
}
public final void addChild(RelationSorter sorterId, Artifact artifact) throws OseeCoreException {
@@ -1266,7 +1267,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
}
public final void addRelation(IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
- addRelation(RelationOrderBaseTypes.PREEXISTING, relationSide, artifact, null);
+ addRelation(PREEXISTING, relationSide, artifact, null);
}
public final void addRelation(RelationSorter sorterId, IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
@@ -1283,12 +1284,11 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
}
public final void setRelationOrder(IRelationTypeSide relationSide, List<Artifact> artifactsInNewOrder) throws OseeCoreException {
- RelationManager.setRelationOrder(this, relationSide, relationSide.getSide(), RelationOrderBaseTypes.USER_DEFINED,
- artifactsInNewOrder);
+ RelationManager.setRelationOrder(this, relationSide, relationSide.getSide(), USER_DEFINED, artifactsInNewOrder);
}
public final void setRelationOrder(IRelationTypeSide relationEnumeration, RelationSorter orderId) throws OseeCoreException {
- if (RelationOrderBaseTypes.USER_DEFINED == orderId) {
+ if (USER_DEFINED == orderId) {
setRelationOrder(relationEnumeration, getRelatedArtifacts(relationEnumeration));
} else {
List<Artifact> empty = java.util.Collections.emptyList();
@@ -1312,8 +1312,8 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
throw new OseeStateException("Could not set Relation Order");
}
- RelationManager.setRelationOrder(this, relationEnumeration, relationEnumeration.getSide(),
- RelationOrderBaseTypes.USER_DEFINED, currentOrder);
+ RelationManager.setRelationOrder(this, relationEnumeration, relationEnumeration.getSide(), USER_DEFINED,
+ currentOrder);
}
public final void deleteRelation(IRelationTypeSide relationTypeSide, Artifact artifact) throws OseeCoreException {
@@ -1352,7 +1352,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
* Creates new relations that don't already exist and removes relations to artifacts that are not in collection
*/
public final void setRelations(IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
- setRelations(RelationOrderBaseTypes.PREEXISTING, relationSide, artifacts);
+ setRelations(PREEXISTING, relationSide, artifacts);
}
public final boolean isLinksLoaded() {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeWorker.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeWorker.java
index 18f38cd01f7..2314a7d7a34 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeWorker.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/change/RelationChangeWorker.java
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.change;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -100,8 +100,7 @@ public class RelationChangeWorker implements IChangeWorker {
}
guids.add(artifact.getGuid());
- relationOrderData.addOrderList(link.getRelationType(), link.getSide(artifact),
- RelationOrderBaseTypes.USER_DEFINED, guids);
+ relationOrderData.addOrderList(link.getRelationType(), link.getSide(artifact), USER_DEFINED, guids);
setRelationOrder(otherSideCurrent, relationOrderData);
}
otherSideCurrent.persist("Replace With Baseline Version resolved by appending");
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java
index 72c9756de67..821abce4755 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java
@@ -10,14 +10,14 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.importing.operations;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -53,7 +53,7 @@ public class RoughToRealArtifactOperation extends AbstractOperation {
this.transaction = transaction;
this.artifactResolver = artifactResolver;
this.destinationArtifact = destinationArtifact;
- this.importArtifactOrder = RelationOrderBaseTypes.USER_DEFINED;
+ this.importArtifactOrder = USER_DEFINED;
this.roughToRealArtifact = new HashMap<>();
this.deleteUnmatchedArtifacts = deleteUnmatchedArtifacts;
this.extractor = extractor;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java
index aa1ff0246d9..3503a5e86f8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/internal/DslToTypeLoader.java
@@ -23,7 +23,6 @@ import java.util.Set;
import java.util.logging.Level;
import org.eclipse.emf.common.util.EList;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.dsl.OseeDslResource;
import org.eclipse.osee.framework.core.dsl.OseeDslResourceUtil;
@@ -46,6 +45,7 @@ import org.eclipse.osee.framework.core.dsl.oseeDsl.XOseeEnumType;
import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType;
import org.eclipse.osee.framework.core.dsl.oseeDsl.util.OseeDslSwitch;
import org.eclipse.osee.framework.core.enums.CoreBranches;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.IOseeStorable;
import org.eclipse.osee.framework.core.model.OseeEnumEntry;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
index 92b6de69203..c0ba72c77fa 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
@@ -10,16 +10,16 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.HasBranch;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
index 2c582d48727..fda689326ae 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.framework.skynet.core.relation;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B;
import java.util.ArrayList;
@@ -25,11 +26,10 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.ModificationType;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist;
@@ -509,7 +509,7 @@ public class RelationManager {
}
public static void addRelation(IRelationType relationType, Artifact artifactA, Artifact artifactB, String rationale) throws OseeCoreException {
- addRelation(RelationOrderBaseTypes.PREEXISTING, relationType, artifactA, artifactB, rationale);
+ addRelation(PREEXISTING, relationType, artifactA, artifactB, rationale);
}
public static void addRelation(RelationSorter sorterId, IRelationType relationTypeToken, Artifact artifactA, Artifact artifactB, String rationale) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java
index 0dc386c959a..24cbcdc7957 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java
@@ -11,11 +11,12 @@
package org.eclipse.osee.framework.skynet.core.relation;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -90,11 +91,11 @@ public class RelationTypeSideSorter extends RelationTypeSide {
@SuppressWarnings("unchecked")
public void addItem(RelationSorter sorterId, IArtifact itemToAdd) throws OseeCoreException {
RelationSorter sorterIdToUse = sorterId;
- if (sorterIdToUse == RelationOrderBaseTypes.PREEXISTING) {
+ if (sorterIdToUse == PREEXISTING) {
sorterIdToUse = getSorterId();
}
List<IArtifact> relatives = Collections.emptyList();
- if (RelationOrderBaseTypes.USER_DEFINED == sorterIdToUse) {
+ if (USER_DEFINED == sorterIdToUse) {
IArtifact target = getIArtifact();
relatives = (List<IArtifact>) target.getRelatedArtifacts(this);
if (relatives.contains(itemToAdd)) {
@@ -112,7 +113,7 @@ public class RelationTypeSideSorter extends RelationTypeSide {
sorterIdToUse = getSorterId();
}
List<IArtifact> relatives = Collections.emptyList();
- if (RelationOrderBaseTypes.USER_DEFINED == sorterIdToUse) {
+ if (USER_DEFINED == sorterIdToUse) {
IArtifact target = getIArtifact();
relatives = (List<IArtifact>) target.getRelatedArtifacts(this);
if (relatives.contains(itemToRemove)) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java
index ceb93648976..f30af5718d1 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.skynet.core.relation.order;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
/**
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java
index 0a7473eb2fb..3f73d7c8121 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.order;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -19,9 +20,8 @@ import java.util.List;
import java.util.Map.Entry;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact;
import org.eclipse.osee.framework.core.model.event.DefaultBasicUuidRelationReorder;
import org.eclipse.osee.framework.core.model.event.RelationOrderModType;
@@ -141,7 +141,7 @@ public class RelationOrderData {
}
protected boolean isRelativeOrderChange(IRelationType type, RelationSide side, RelationSorter sorterId, List<String> relativeSequence) throws OseeCoreException {
- return sorterId.equals(RelationOrderBaseTypes.USER_DEFINED) && !relativeSequence.equals(getOrderList(type, side));
+ return sorterId.equals(USER_DEFINED) && !relativeSequence.equals(getOrderList(type, side));
}
protected boolean isDifferentSorterId(RelationType type, RelationSide side, RelationSorter sorterId) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java
index 74d5933063a..db3866328da 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java
@@ -10,15 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.order;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java
index 2f957579f99..c813f599a52 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderParser.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java
index 9cacee14517..91d8a39e34b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java
@@ -16,7 +16,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java
index df2b5934adf..3a99573ebb6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java
@@ -10,10 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.sorters;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactNameComparator;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
@@ -34,7 +35,7 @@ public class LexicographicalRelationSorter implements IRelationSorter {
public LexicographicalRelationSorter(SortMode sortMode) {
boolean isDescending = SortMode.DESCENDING == sortMode;
this.comparator = new ArtifactNameComparator(isDescending);
- this.id = isDescending ? RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC : RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
+ this.id = isDescending ? LEXICOGRAPHICAL_DESC : LEXICOGRAPHICAL_ASC;
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java
index d9416c5821d..8d4950abf3f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.sorters;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
@@ -23,7 +23,7 @@ public class UnorderedRelationSorter implements IRelationSorter {
@Override
public RelationSorter getSorterId() {
- return RelationOrderBaseTypes.UNORDERED;
+ return UNORDERED;
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java
index eb1aee4c4d8..998e4c0bbb0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.relation.sorters;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
@@ -24,7 +24,7 @@ public class UserDefinedRelationSorter implements IRelationSorter {
@Override
public RelationSorter getSorterId() {
- return RelationOrderBaseTypes.USER_DEFINED;
+ return USER_DEFINED;
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java
index 238792bacef..7b465319c52 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/renderer/RelationOrderRendererTest.java
@@ -10,15 +10,17 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.renderer;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.model.cache.ArtifactTypeCache;
@@ -56,14 +58,14 @@ public class RelationOrderRendererTest {
RelationOrderData orderData = new MockRelationOrderData();
List<Object[]> expectedData = new ArrayList<>();
- addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A,
- RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, "1", "2", "3");
+ addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A, LEXICOGRAPHICAL_ASC, "1", "2",
+ "3");
addData(orderData, expectedData, "Relation 2", "Relation 2_B", RelationSide.SIDE_B, //
- RelationOrderBaseTypes.UNORDERED, "4", "5", "6");
+ UNORDERED, "4", "5", "6");
addData(orderData, expectedData, "Relation 3", "Relation 3_B", RelationSide.SIDE_B, //
- RelationOrderBaseTypes.USER_DEFINED, "7", "8", "9");
+ USER_DEFINED, "7", "8", "9");
checkRelationOrderRenderer(getExpected(expectedData), orderData);
}
@@ -72,8 +74,7 @@ public class RelationOrderRendererTest {
public void testRenderingEmptyGuids() throws OseeCoreException {
RelationOrderData orderData = new MockRelationOrderData();
List<Object[]> expectedData = new ArrayList<>();
- addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A,
- RelationOrderBaseTypes.USER_DEFINED);
+ addData(orderData, expectedData, "Relation 1", "Relation 1_A", RelationSide.SIDE_A, USER_DEFINED);
checkRelationOrderRenderer(getExpected(expectedData), orderData);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java
index 87a59479701..635d733d7f8 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java
@@ -17,7 +17,7 @@ import java.util.logging.Level;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
index 91b14bfd3bc..e80a0a9db06 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
@@ -28,8 +28,8 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.PresentationType;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.help.ui.OseeHelpContext;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java
index d975c752103..9e0d169ee1d 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java
@@ -10,15 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.artifact;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -91,7 +91,7 @@ public class ArtifactPasteOperation extends AbstractOperation {
RelationOrderData data = RelationManager.createRelationOrderData(source);
RelationSorter order =
data.getCurrentSorterGuid(RelationTypeManager.getType(relationTypeSide), relationTypeSide.getSide());
- if (RelationOrderBaseTypes.USER_DEFINED == order) {
+ if (USER_DEFINED == order) {
newArtifact.setRelationOrder(relationTypeSide, copiedChildren);
} else {
newArtifact.setRelationOrder(relationTypeSide, order);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
index 05cc97569d8..573c1bc8f56 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
@@ -10,15 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.blam.operation;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
@@ -99,12 +99,12 @@ public class RelationOrderRepairBlam extends AbstractBlam {
RelationSide side = RelationSide.fromString(typeSide.getSecond());
RelationSorter sorterGuid = currentData.getCurrentSorterGuid(type, side);
- if (sorterGuid.equals(RelationOrderBaseTypes.USER_DEFINED)) {
+ if (sorterGuid.equals(USER_DEFINED)) {
List<String> orderList = currentData.getOrderList(type, side);
List<String> actualOrder = Artifacts.toGuids(RelationManager.getRelatedArtifacts(art, type, side));
if (!orderList.equals(actualOrder)) {
logf("Incorrect order on %s (%s %s)\n", art.getName(), type, side);
- currentData.storeFromGuids(type, side, RelationOrderBaseTypes.USER_DEFINED, actualOrder);
+ currentData.storeFromGuids(type, side, USER_DEFINED, actualOrder);
art.persist(transaction);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java
index 5f2a0794d01..9ac481245db 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.explorer;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.io.File;
import java.util.Arrays;
import java.util.LinkedList;
@@ -23,7 +24,6 @@ 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;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.Operations;
@@ -178,8 +178,8 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
InterArtifactExplorerDropHandlerOperation interDropHandler =
new InterArtifactExplorerDropHandlerOperation(parentArtifact, artifactsToBeRelated, true);
Operations.executeAsJob(interDropHandler, true);
- } else if (artifactsToBeRelated != null && isValidForArtifactDrop(event) && MessageDialog.openQuestion(viewPart.getViewSite().getShell(),
- "Confirm Move",
+ } else if (artifactsToBeRelated != null && isValidForArtifactDrop(event) && MessageDialog.openQuestion(
+ viewPart.getViewSite().getShell(), "Confirm Move",
"Are you sure you want to make each of the selected artifacts a child of " + parentArtifact.getName() + "?")) {
try {
SkynetTransaction transaction =
@@ -191,7 +191,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop {
currentParent.deleteRelation(CoreRelationTypes.Default_Hierarchical__Child, artifact);
currentParent.persist(transaction);
}
- parentArtifact.addChild(RelationOrderBaseTypes.USER_DEFINED, artifact);
+ parentArtifact.addChild(USER_DEFINED, artifact);
parentArtifact.persist(transaction);
}
transaction.execute();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java
index 0b80ccb4c26..d52ffd70e7b 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.ui.skynet.group;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@@ -22,7 +23,6 @@ import org.eclipse.jface.viewers.TreeViewer;
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.RelationOrderBaseTypes;
import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -257,8 +257,8 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop {
Artifact targetArtifact = dragOverExplorerItem.getArtifact();
for (Artifact art : insertArts) {
- parentArtifact.addRelation(RelationOrderBaseTypes.USER_DEFINED,
- CoreRelationTypes.Universal_Grouping__Members, targetArtifact, isFeedbackAfter, art, "");
+ parentArtifact.addRelation(USER_DEFINED, CoreRelationTypes.Universal_Grouping__Members,
+ targetArtifact, isFeedbackAfter, art, "");
}
parentArtifact.persist(getClass().getSimpleName());
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java
index 2098c2c1c54..8e70e3eee45 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java
@@ -14,8 +14,8 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.model.type.RelationType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java
index 8e7bc8df9f0..e9dc0a7622d 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/RelationManagerTest.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.internal.relation;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
import static org.eclipse.osee.orcs.core.internal.relation.RelationUtil.DEFAULT_HIERARCHY;
import static org.eclipse.osee.orcs.core.internal.relation.RelationUtil.IS_CHILD;
import static org.eclipse.osee.orcs.core.internal.relation.RelationUtil.IS_PARENT;
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java
index b59e03aba70..3de8c61a2a8 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImplTest.java
@@ -15,10 +15,10 @@ import static org.eclipse.osee.framework.core.enums.CoreBranches.SYSTEM_ROOT;
import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Default_Hierarchical__Child;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.PREEXISTING;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.UNORDERED;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B;
import static org.eclipse.osee.orcs.core.internal.relation.RelationUtil.DEFAULT_HIERARCHY;
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java
index a6f49c860e0..df7ac40029d 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java
@@ -10,9 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.order;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.UNORDERED;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -27,9 +28,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -179,18 +179,18 @@ public class OrderManagerTest {
@Test
public void testGetSorterId() throws OseeCoreException {
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.USER_DEFINED);
- when(orderData2.getSorterId()).thenReturn(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
+ when(orderData1.getSorterId()).thenReturn(USER_DEFINED);
+ when(orderData2.getSorterId()).thenReturn(LEXICOGRAPHICAL_ASC);
orderManager.add(typeSide1, orderData1);
orderManager.add(typeSide2, orderData2);
- assertEquals(RelationOrderBaseTypes.USER_DEFINED, orderManager.getSorterId(typeSide1));
+ assertEquals(USER_DEFINED, orderManager.getSorterId(typeSide1));
- assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, orderManager.getSorterId(typeSide2));
+ assertEquals(LEXICOGRAPHICAL_ASC, orderManager.getSorterId(typeSide2));
RelationSorter actual = orderManager.getSorterId(typeSide3);
- assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, actual);
+ assertEquals(LEXICOGRAPHICAL_ASC, actual);
}
@Test
@@ -228,9 +228,9 @@ public class OrderManagerTest {
when(orderData1.getOrderIds()).thenReturn(relatives1);
when(orderData2.getOrderIds()).thenReturn(relatives2);
when(orderData3.getOrderIds()).thenReturn(relatives3);
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.USER_DEFINED);
- when(orderData2.getSorterId()).thenReturn(RelationOrderBaseTypes.USER_DEFINED);
- when(orderData3.getSorterId()).thenReturn(RelationOrderBaseTypes.USER_DEFINED);
+ when(orderData1.getSorterId()).thenReturn(USER_DEFINED);
+ when(orderData2.getSorterId()).thenReturn(USER_DEFINED);
+ when(orderData3.getSorterId()).thenReturn(USER_DEFINED);
IRelationTypeSide typeSide4 = mock(IRelationTypeSide.class);
IRelationTypeSide typeSide5 = mock(IRelationTypeSide.class);
@@ -277,21 +277,21 @@ public class OrderManagerTest {
when(mock2.getName()).thenReturn("1");
when(mock3.getName()).thenReturn("c");
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.UNORDERED);
+ when(orderData1.getSorterId()).thenReturn(UNORDERED);
orderManager.sort(typeSide1, items);
assertOrdered(items, mock1, mock2, mock3);
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.USER_DEFINED);
+ when(orderData1.getSorterId()).thenReturn(USER_DEFINED);
Collections.shuffle(items);
orderManager.sort(typeSide1, items);
assertOrdered(items, mock2, mock3, mock1);
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC);
+ when(orderData1.getSorterId()).thenReturn(LEXICOGRAPHICAL_ASC);
Collections.shuffle(items);
orderManager.sort(typeSide1, items);
assertOrdered(items, mock2, mock1, mock3);
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ when(orderData1.getSorterId()).thenReturn(LEXICOGRAPHICAL_DESC);
Collections.shuffle(items);
orderManager.sort(typeSide1, items);
assertOrdered(items, mock3, mock1, mock2);
@@ -305,23 +305,22 @@ public class OrderManagerTest {
when(mock2.getGuid()).thenReturn("1");
when(mock3.getGuid()).thenReturn("3");
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.USER_DEFINED);
+ when(orderData1.getSorterId()).thenReturn(USER_DEFINED);
when(orderData1.getOrderIds()).thenReturn(relatives1);
orderManager.add(typeSide1, orderData1);
- orderManager.setOrder(typeSide1, RelationOrderBaseTypes.USER_DEFINED, items);
+ orderManager.setOrder(typeSide1, USER_DEFINED, items);
verify(accessor).store(orderManager, OrderChange.NoChange);
- orderManager.setOrder(typeSide1, RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC,
- Collections.<Identifiable<String>> emptyList());
+ orderManager.setOrder(typeSide1, LEXICOGRAPHICAL_DESC, Collections.<Identifiable<String>> emptyList());
verify(accessor).store(orderManager, OrderChange.OrderRequest);
- verify(orderData1).setSorterId(RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ verify(orderData1).setSorterId(LEXICOGRAPHICAL_DESC);
verify(orderData1).setOrderIds(Collections.<String> emptyList());
Collections.shuffle(items);
- when(orderData1.getSorterId()).thenReturn(RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
- orderManager.setOrder(typeSide1, RelationOrderBaseTypes.USER_DEFINED, items);
+ when(orderData1.getSorterId()).thenReturn(LEXICOGRAPHICAL_DESC);
+ orderManager.setOrder(typeSide1, USER_DEFINED, items);
verify(accessor).store(orderManager, OrderChange.SetToDefault);
assertEquals(0, orderManager.size());
}
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
index 9d232876fd9..291c5faac9a 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
@@ -10,6 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.order;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@@ -21,12 +24,11 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.TokenFactory;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
@@ -66,12 +68,12 @@ public class OrderParserTest {
private static final String ONE_ENTRY_NO_LIST_PATTERN = String.format("<OrderList>%s</OrderList>", ENTRY_NO_LIST_PATTERN);
private static final String TWO_ENTRY_PATTERN = String.format("<OrderList>%s%s</OrderList>", ENTRY_PATTERN, ENTRY_PATTERN);
- private static final String DATA_1 = String.format(ONE_ENTRY_PATTERN, REL_TYPE_1_NAME, RelationSide.SIDE_B, RelationOrderBaseTypes.USER_DEFINED.getGuid(), Collections.toString(",", ORDER_LIST_1));
- private static final String DATA_2 = String.format(ONE_ENTRY_PATTERN, REL_TYPE_1_NAME, RelationSide.SIDE_B, RelationOrderBaseTypes.USER_DEFINED.getGuid(), Collections.toString(",", ORDER_LIST_2));
+ private static final String DATA_1 = String.format(ONE_ENTRY_PATTERN, REL_TYPE_1_NAME, RelationSide.SIDE_B, USER_DEFINED.getGuid(), Collections.toString(",", ORDER_LIST_1));
+ private static final String DATA_2 = String.format(ONE_ENTRY_PATTERN, REL_TYPE_1_NAME, RelationSide.SIDE_B, USER_DEFINED.getGuid(), Collections.toString(",", ORDER_LIST_2));
private static final String DATA_3 = String.format(TWO_ENTRY_PATTERN,
- REL_TYPE_1_NAME, RelationSide.SIDE_B, RelationOrderBaseTypes.USER_DEFINED.getGuid(), Collections.toString(",", ORDER_LIST_2),
- REL_TYPE_2_NAME, RelationSide.SIDE_A, RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC.getGuid(), Collections.toString(",", ORDER_LIST_3));
- private static final String DATA_4 = String.format(ONE_ENTRY_NO_LIST_PATTERN, REL_TYPE_2_NAME, RelationSide.SIDE_A, RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC.getGuid());
+ REL_TYPE_1_NAME, RelationSide.SIDE_B, USER_DEFINED.getGuid(), Collections.toString(",", ORDER_LIST_2),
+ REL_TYPE_2_NAME, RelationSide.SIDE_A, LEXICOGRAPHICAL_ASC.getGuid(), Collections.toString(",", ORDER_LIST_3));
+ private static final String DATA_4 = String.format(ONE_ENTRY_NO_LIST_PATTERN, REL_TYPE_2_NAME, RelationSide.SIDE_A, LEXICOGRAPHICAL_DESC.getGuid());
private static final String EMPTY_TYPE = "<OrderList><Order side=\"SIDE_B\" orderType=\"AAT0xogoMjMBhARkBZQA\"></Order></OrderList>";
private static final String EMPTY_SIDE = "<OrderList><Order relType=\"X\" orderType=\"AAT0xogoMjMBhARkBZQA\"></Order></OrderList>";
@@ -172,7 +174,7 @@ public class OrderParserTest {
verify(hasOrderData, times(1)).add(typeSideCaptor.capture(), orderDataCaptor.capture());
- verifyData(0, REL_TYPE_1_ID, RelationSide.SIDE_B, RelationOrderBaseTypes.USER_DEFINED, ORDER_LIST_1);
+ verifyData(0, REL_TYPE_1_ID, RelationSide.SIDE_B, USER_DEFINED, ORDER_LIST_1);
}
@Test
@@ -181,7 +183,7 @@ public class OrderParserTest {
verify(hasOrderData, times(1)).add(typeSideCaptor.capture(), orderDataCaptor.capture());
- verifyData(0, REL_TYPE_1_ID, RelationSide.SIDE_B, RelationOrderBaseTypes.USER_DEFINED, ORDER_LIST_2);
+ verifyData(0, REL_TYPE_1_ID, RelationSide.SIDE_B, USER_DEFINED, ORDER_LIST_2);
}
@Test
@@ -190,8 +192,8 @@ public class OrderParserTest {
verify(hasOrderData, times(2)).add(typeSideCaptor.capture(), orderDataCaptor.capture());
- verifyData(0, REL_TYPE_1_ID, RelationSide.SIDE_B, RelationOrderBaseTypes.USER_DEFINED, ORDER_LIST_2);
- verifyData(1, REL_TYPE_2_ID, RelationSide.SIDE_A, RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, ORDER_LIST_3);
+ verifyData(0, REL_TYPE_1_ID, RelationSide.SIDE_B, USER_DEFINED, ORDER_LIST_2);
+ verifyData(1, REL_TYPE_2_ID, RelationSide.SIDE_A, LEXICOGRAPHICAL_ASC, ORDER_LIST_3);
}
@Test
@@ -200,15 +202,15 @@ public class OrderParserTest {
verify(hasOrderData, times(1)).add(typeSideCaptor.capture(), orderDataCaptor.capture());
- verifyData(0, REL_TYPE_2_ID, RelationSide.SIDE_A, RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ verifyData(0, REL_TYPE_2_ID, RelationSide.SIDE_A, LEXICOGRAPHICAL_DESC);
}
@Test
public void testToXml() throws OseeCoreException {
//@formatter:off
Map<IRelationTypeSide, OrderData> data = new LinkedHashMap<>();
- add(data, REL_TYPE_1_ID, REL_TYPE_1_NAME, RelationSide.SIDE_B, RelationOrderBaseTypes.USER_DEFINED, ORDER_LIST_2);
- add(data, REL_TYPE_2_ID, REL_TYPE_2_NAME, RelationSide.SIDE_A, RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, ORDER_LIST_3);
+ add(data, REL_TYPE_1_ID, REL_TYPE_1_NAME, RelationSide.SIDE_B, USER_DEFINED, ORDER_LIST_2);
+ add(data, REL_TYPE_2_ID, REL_TYPE_2_NAME, RelationSide.SIDE_A, LEXICOGRAPHICAL_ASC, ORDER_LIST_3);
//@formatter:on
when(hasOrderData.iterator()).thenReturn(data.entrySet().iterator());
@@ -229,7 +231,7 @@ public class OrderParserTest {
@Test
public void testToXmlEmptyList() throws OseeCoreException {
Map<IRelationTypeSide, OrderData> data = new LinkedHashMap<>();
- add(data, REL_TYPE_1_ID, REL_TYPE_2_NAME, RelationSide.SIDE_A, RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ add(data, REL_TYPE_1_ID, REL_TYPE_2_NAME, RelationSide.SIDE_A, LEXICOGRAPHICAL_DESC);
when(hasOrderData.iterator()).thenReturn(data.entrySet().iterator());
String actual = parser.toXml(hasOrderData);
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProviderTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProviderTest.java
index d0035365e9c..32b6035fd9a 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProviderTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProviderTest.java
@@ -10,11 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.sorter;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.data.RelationTypes;
@@ -52,16 +53,15 @@ public class SorterProviderTest {
@Test
public void testGetDefaultSorterId() throws OseeCoreException {
when(relationTypeCache.getDefaultOrderTypeGuid(CoreRelationTypes.Default_Hierarchical__Child)).thenReturn(
- RelationOrderBaseTypes.USER_DEFINED);
+ USER_DEFINED);
RelationSorter actual1 = provider.getDefaultSorterId(CoreRelationTypes.Default_Hierarchical__Child);
- assertEquals(RelationOrderBaseTypes.USER_DEFINED, actual1);
+ assertEquals(USER_DEFINED, actual1);
- when(relationTypeCache.getDefaultOrderTypeGuid(CoreRelationTypes.Users_User)).thenReturn(
- RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC);
+ when(relationTypeCache.getDefaultOrderTypeGuid(CoreRelationTypes.Users_User)).thenReturn(LEXICOGRAPHICAL_DESC);
RelationSorter actual2 = provider.getDefaultSorterId(CoreRelationTypes.Users_User);
- assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC, actual2);
+ assertEquals(LEXICOGRAPHICAL_DESC, actual2);
}
@Test
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterTest.java
index aeb4d4b763a..bf42b64523e 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterTest.java
@@ -10,12 +10,15 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.sorter;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
import org.eclipse.osee.framework.jdk.core.util.GUID;
@@ -94,13 +97,7 @@ public class SorterTest {
Identifiable<String> art4 = createItem(names[3]);
List<Identifiable<String>> artifacts = Arrays.asList(art1, art2, art3, art4);
- return new Object[] {
- "Unordered Test",
- new UnorderedSorter(),
- RelationOrderBaseTypes.UNORDERED,
- null,
- artifacts,
- artifacts};
+ return new Object[] {"Unordered Test", new UnorderedSorter(), UNORDERED, null, artifacts, artifacts};
}
private static Object[] createLexicographicalTest(SortOrder mode, String... names) {
@@ -111,9 +108,9 @@ public class SorterTest {
RelationSorter orderId;
if (mode.isAscending()) {
- orderId = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
+ orderId = LEXICOGRAPHICAL_ASC;
} else {
- orderId = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+ orderId = LEXICOGRAPHICAL_DESC;
}
List<Identifiable<String>> itemsToOrder = Arrays.asList(art3, art1, art4, art2);
@@ -143,7 +140,7 @@ public class SorterTest {
return new Object[] {
"UserDefined",
new UserDefinedSorter(),
- RelationOrderBaseTypes.USER_DEFINED,
+ USER_DEFINED,
relatives,
itemsToOrder,
expectedOrder};
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java
index 2f37b051146..8ae4df780a7 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImplTest.java
@@ -22,8 +22,8 @@ import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.Qualifica
import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.RelationOrder;
import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.WordTemplateContent;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B;
import static org.eclipse.osee.orcs.core.internal.relation.RelationUtil.DEFAULT_HIERARCHY;
import static org.junit.Assert.assertEquals;
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 2c9524c88cd..e0010214f63 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
@@ -14,7 +14,7 @@ import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.DirectSoft
import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.Category;
import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.Name;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A;
import static org.eclipse.osee.orcs.core.internal.relation.RelationUtil.DEFAULT_HIERARCHY;
import static org.eclipse.osee.orcs.core.internal.relation.RelationUtil.IS_CHILD;
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
index fc2c6ce6474..8f919277020 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/types/OrcsTypesTest.java
@@ -10,6 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.types;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B;
import static org.junit.Assert.assertEquals;
@@ -37,7 +40,6 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -799,8 +801,8 @@ public class OrcsTypesTest {
RelationTypes relTypes = orcsTypes.getRelationTypes();
//@formatter:off
- assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, relTypes.getDefaultOrderTypeGuid(REQUIREMENT_REL));
- assertEquals(RelationOrderBaseTypes.UNORDERED, relTypes.getDefaultOrderTypeGuid(ANOTHER_REL));
+ assertEquals(LEXICOGRAPHICAL_ASC, relTypes.getDefaultOrderTypeGuid(REQUIREMENT_REL));
+ assertEquals(UNORDERED, relTypes.getDefaultOrderTypeGuid(ANOTHER_REL));
//@formatter:on
}
@@ -928,7 +930,7 @@ public class OrcsTypesTest {
assertEquals(OTHER_ARTIFACT, relTypes.getArtifactType(relation, SIDE_B));
assertEquals(ARTIFACT, relTypes.getArtifactTypeSideA(relation));
assertEquals(OTHER_ARTIFACT, relTypes.getArtifactTypeSideB(relation));
- assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC, relTypes.getDefaultOrderTypeGuid(relation));
+ assertEquals(LEXICOGRAPHICAL_DESC, relTypes.getDefaultOrderTypeGuid(relation));
assertEquals(RelationTypeMultiplicity.MANY_TO_ONE, relTypes.getMultiplicity(relation));
assertEquals("dynamic-sideA", relTypes.getSideName(relation, SIDE_A));
assertEquals("dynamic-sideB", relTypes.getSideName(relation, SIDE_B));
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java
index ae315864f22..e0e0ccab668 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java
@@ -14,10 +14,10 @@ import java.util.Collection;
import java.util.List;
import org.eclipse.osee.framework.core.data.ApplicabilityId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.orcs.OrcsSession;
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java
index d0fb565c92b..f2d0882fe8d 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java
@@ -12,6 +12,8 @@ package org.eclipse.osee.orcs.core.internal.relation.impl;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.PREEXISTING;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_A;
import static org.eclipse.osee.framework.core.enums.RelationSide.SIDE_B;
import static org.eclipse.osee.framework.jdk.core.util.Conditions.checkNotNull;
@@ -34,12 +36,11 @@ import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.osee.framework.core.data.ApplicabilityId;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
@@ -215,12 +216,12 @@ public class RelationManagerImpl implements RelationManager {
@Override
public void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode) throws OseeCoreException {
- relate(session, aNode, type, bNode, emptyString(), RelationOrderBaseTypes.PREEXISTING);
+ relate(session, aNode, type, bNode, emptyString(), PREEXISTING);
}
@Override
public void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, String rationale) throws OseeCoreException {
- relate(session, aNode, type, bNode, rationale, RelationOrderBaseTypes.PREEXISTING);
+ relate(session, aNode, type, bNode, rationale, PREEXISTING);
}
@Override
@@ -427,7 +428,7 @@ public class RelationManagerImpl implements RelationManager {
}
private void order(OrcsSession session, IRelationType type, RelationNode node1, RelationSide side, OrderOp op, Collection<? extends RelationNode> node2) throws OseeCoreException {
- order(session, type, node1, side, RelationOrderBaseTypes.PREEXISTING, op, node2);
+ order(session, type, node1, side, PREEXISTING, op, node2);
}
private void order(OrcsSession session, IRelationType type, RelationNode node1, RelationSide side, RelationSorter sorterId, OrderOp op, Collection<? extends RelationNode> node2) throws OseeCoreException {
@@ -436,11 +437,11 @@ public class RelationManagerImpl implements RelationManager {
RelationSide orderSide = side.oppositeSide();
IRelationTypeSide key = asTypeSide(type, orderSide);
RelationSorter sorterIdToUse = sorterId;
- if (sorterIdToUse == RelationOrderBaseTypes.PREEXISTING) {
+ if (sorterIdToUse == PREEXISTING) {
sorterIdToUse = orderManager.getSorterId(key);
}
List<Identifiable<String>> relatives = Collections.emptyList();
- if (RelationOrderBaseTypes.USER_DEFINED == sorterIdToUse) {
+ if (USER_DEFINED == sorterIdToUse) {
ResultSet<RelationNode> arts = getRelated(session, type, node1, side);
relatives = new LinkedList<>();
for (RelationNode art : arts) {
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderData.java
index 21da29af806..0170c0a98ca 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderData.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderData.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.internal.relation.order;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
/**
* @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java
index ec2fb77d95e..b246ff2bc6b 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.order;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -18,10 +19,9 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
@@ -186,7 +186,7 @@ public class OrderManager implements HasOrderData {
private boolean isRelativeOrderChange(IRelationTypeSide typeAndSide, RelationSorter sorterId, List<String> relativeSequence) throws OseeCoreException {
boolean result = false;
- if (sorterId.equals(RelationOrderBaseTypes.USER_DEFINED)) {
+ if (sorterId.equals(USER_DEFINED)) {
List<String> currentOrder = getOrderIds(typeAndSide);
result = !areSame(currentOrder, relativeSequence);
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java
index 01305126691..1cc8ec8ed65 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java
@@ -28,9 +28,9 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.util.Lib;
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/LexicographicalSorter.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/LexicographicalSorter.java
index 84f67750189..27eb6f7ea08 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/LexicographicalSorter.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/LexicographicalSorter.java
@@ -10,10 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.sorter;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_ASC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.orcs.utility.NameComparator;
import org.eclipse.osee.orcs.utility.SortOrder;
@@ -30,9 +31,9 @@ public class LexicographicalSorter implements Sorter {
public LexicographicalSorter(SortOrder sortOrder) {
this.comparator = new NameComparator(sortOrder);
if (sortOrder.isAscending()) {
- id = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
+ id = LEXICOGRAPHICAL_ASC;
} else {
- id = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+ id = LEXICOGRAPHICAL_DESC;
}
}
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/Sorter.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/Sorter.java
index 725981d2034..2a8f94e831d 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/Sorter.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/Sorter.java
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.core.internal.relation.sorter;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
/**
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java
index 99d4dbfa6a7..8283a98a4f6 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.core.internal.relation.sorter;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UnorderedSorter.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UnorderedSorter.java
index 34f4ff89c5e..ae1291dc3b9 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UnorderedSorter.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UnorderedSorter.java
@@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.sorter;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.UNORDERED;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
/**
@@ -22,7 +22,7 @@ public class UnorderedSorter implements Sorter {
@Override
public RelationSorter getId() {
- return RelationOrderBaseTypes.UNORDERED;
+ return UNORDERED;
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedSorter.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedSorter.java
index 0156d5fbdea..5beaf58e93b 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedSorter.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedSorter.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.orcs.core.internal.relation.sorter;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.USER_DEFINED;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.RelationSorter;
-import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
/**
@@ -23,7 +23,7 @@ public class UserDefinedSorter implements Sorter {
@Override
public RelationSorter getId() {
- return RelationOrderBaseTypes.USER_DEFINED;
+ return USER_DEFINED;
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
index 945f0c7e6e6..c7075d65f68 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java
@@ -21,7 +21,6 @@ import org.eclipse.osee.framework.core.data.AttributeId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.Tuple2Type;
@@ -29,6 +28,7 @@ import org.eclipse.osee.framework.core.data.Tuple3Type;
import org.eclipse.osee.framework.core.data.Tuple4Type;
import org.eclipse.osee.framework.core.data.TupleTypeId;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Id;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
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 35d21df681a..1c60d277112 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
@@ -23,9 +23,9 @@ import org.eclipse.osee.framework.core.data.ArtifactId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
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.type.ResultSet;
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java
index 15cb138ba7e..5c281884fb2 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/RelationTypesImpl.java
@@ -13,9 +13,9 @@ package org.eclipse.osee.orcs.core.internal.types.impl;
import java.util.Collection;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.dsl.oseeDsl.XRelationType;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
index 13da2b9a482..4f3a63798ba 100644
--- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
+++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java
@@ -17,7 +17,7 @@ import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Default_Hi
import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Default_Hierarchical__Parent;
import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Dependency__Artifact;
import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Dependency__Dependency;
-import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+import static org.eclipse.osee.framework.core.enums.RelationSorter.LEXICOGRAPHICAL_DESC;
import static org.eclipse.osee.framework.core.enums.SystemUser.OseeSystem;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java
index 84bc3a70345..13797415f7e 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/data/RelationTypes.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.orcs.data;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IRelationType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationSide;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
index 6e5acb83f01..6894fe333e7 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java
@@ -19,13 +19,13 @@ import org.eclipse.osee.framework.core.data.AttributeId;
import org.eclipse.osee.framework.core.data.BranchId;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.Tuple2Type;
import org.eclipse.osee.framework.core.data.Tuple3Type;
import org.eclipse.osee.framework.core.data.Tuple4Type;
import org.eclipse.osee.framework.core.data.TupleTypeId;
+import org.eclipse.osee.framework.core.enums.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.data.TransactionReadable;

Back to the top