refactor: Move RelationSorter to enum package

Change-Id: Ic7fcc92cd463c8d3eef1d23b55e937c7c366f56e

5 files changed, 38 insertions, 37 deletions

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};