Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2016-09-23 14:14:41 -0400
committerAngel Avila2016-10-04 21:35:39 -0400
commit3978a8614fc5af90ec47da68e885eb1504c81022 (patch)
tree5f19eb8e94e978c7b40d44ea93379fa5c04e8921
parent1c6878a8754621fb103405f9a3bb62c1d0b6d357 (diff)
downloadorg.eclipse.osee-3978a8614fc5af90ec47da68e885eb1504c81022.tar.gz
org.eclipse.osee-3978a8614fc5af90ec47da68e885eb1504c81022.tar.xz
org.eclipse.osee-3978a8614fc5af90ec47da68e885eb1504c81022.zip
refactor: Rename IRelationSorterId to RelationSorter
- Strictly an automated refactor Change-Id: I471adc15cfb65ca689af8a23bfd78f870a41e441
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/RelationOrderMergeUtilityTest.java8
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ArtifactPasteOperationTest.java6
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/ReplaceWithBaselineTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationSorter.java (renamed from plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationSorterId.java)15
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/RelationOrderBaseTypes.java26
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java10
-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.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java16
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/RoughToRealArtifactOperation.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorter.java18
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/IRelationSorter.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderData.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationOrderMergeUtility.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterProvider.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/LexicographicalRelationSorter.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UnorderedRelationSorter.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/sorters/UserDefinedRelationSorter.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java20
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManagerTest.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProviderTest.java12
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterTest.java8
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationManager.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderData.java10
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java26
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/LexicographicalSorter.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/Sorter.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java14
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UnorderedSorter.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedSorter.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionBuilderImpl.java6
-rw-r--r--plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java6
-rw-r--r--plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/transaction/TransactionBuilder.java6
42 files changed, 186 insertions, 177 deletions
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 8b21057fb17..c89126cfddf 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
@@ -19,7 +19,7 @@ import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
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.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
@@ -57,8 +57,8 @@ public class RelationOrderMergeUtilityTest {
public final OseeHousekeepingRule oseeHousekeeping = new OseeHousekeepingRule();
private final IRelationTypeSide defaultHierarchy = CoreRelationTypes.Default_Hierarchical__Child;
- private final IRelationSorterId ascOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
- private final IRelationSorterId descOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+ private final RelationSorter ascOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
+ private final RelationSorter descOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
private RelationType hierType;
private RelationSide hierSide;
@@ -156,7 +156,7 @@ public class RelationOrderMergeUtilityTest {
Assert.assertNull(mergedOrder);
}
- private void setAsChild(Artifact parent, Artifact child, IRelationSorterId sorter) throws OseeCoreException {
+ private void setAsChild(Artifact parent, Artifact child, RelationSorter sorter) throws OseeCoreException {
child.deleteRelations(CoreRelationTypes.Default_Hierarchical__Parent);
parent.addRelation(sorter, CoreRelationTypes.Default_Hierarchical__Child, child);
}
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 0bc3adc620e..bf8a1bf68ab 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
@@ -18,7 +18,7 @@ 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.IRelationSorterId;
+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;
@@ -145,7 +145,7 @@ public class ArtifactPasteOperationTest {
}
}
- private void checkPaste(Artifact destination, String expectedChild, Artifact copiedArtifact, IRelationSorterId expectedOrderType, String... names) throws OseeCoreException {
+ private void checkPaste(Artifact destination, String expectedChild, Artifact copiedArtifact, RelationSorter expectedOrderType, String... names) throws OseeCoreException {
Artifact newArtifact = destination.getChild(expectedChild);
Assert.assertNotNull(newArtifact);
Assert.assertTrue(!copiedArtifact.getGuid().equals(newArtifact.getGuid()));
@@ -173,7 +173,7 @@ public class ArtifactPasteOperationTest {
checkRelationOrder(destination, RelationOrderBaseTypes.USER_DEFINED, true);
}
- private void checkRelationOrder(Artifact artifactToCheck, IRelationSorterId expectedOrderType, boolean hasChildren) throws OseeCoreException {
+ private void checkRelationOrder(Artifact artifactToCheck, RelationSorter expectedOrderType, boolean hasChildren) throws OseeCoreException {
RelationOrderData data = relationOrderFactory.createRelationOrderData(artifactToCheck);
Assert.assertEquals(1, data.size());
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 a82cb344245..af3b34f9d27 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
@@ -24,7 +24,7 @@ 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.IRelationSorterId;
+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;
@@ -100,8 +100,8 @@ public final class ReplaceWithBaselineTest {
@Rule
public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule();
- private static final IRelationSorterId ascOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
- private static final IRelationSorterId descOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
+ private static final RelationSorter ascOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
+ private static final RelationSorter descOrder = RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
/**
* Refer to table for Case 10*
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java
index 062de750a7a..9b6ad463061 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeUtil.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.dsl.integration.internal;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IAttributeType;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessPermissionEnum;
@@ -92,7 +92,7 @@ public final class OseeUtil {
}
public static String getRelationOrderType(String guid) throws OseeCoreException {
- IRelationSorterId type = RelationOrderBaseTypes.getFromGuid(guid);
+ RelationSorter type = RelationOrderBaseTypes.getFromGuid(guid);
return type.getName().replaceAll(" ", "_");
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationSorterId.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationSorter.java
index cc6b0c5cf3a..1f4ef24e5c2 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/IRelationSorterId.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/RelationSorter.java
@@ -11,10 +11,19 @@
package org.eclipse.osee.framework.core.data;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
+import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
/**
* @author Andrew M. Finkbeiner
*/
-public interface IRelationSorterId extends Identifiable<String> {
- // composition interface requires no additional methods,fields
-}
+public interface RelationSorter extends Identifiable<String> {
+
+ public static RelationSorter create(String id, String name) {
+ final class RelationSorterIdImpl extends NamedIdentity<String> implements RelationSorter {
+ public RelationSorterIdImpl(String guid, String name) {
+ super(guid, name);
+ }
+ }
+ return new RelationSorterIdImpl(id, name);
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
index 90470a21b82..54af2491a2c 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/data/TokenFactory.java
@@ -94,11 +94,11 @@ public final class TokenFactory {
return new BranchToken(Lib.generateUuid(), null);
}
- public static IRelationSorterId createSorterId(String guid, String name) {
+ public static RelationSorter createSorterId(String guid, String name) {
return new SorterIdToken(guid, name);
}
- private final static class SorterIdToken extends NamedIdentity<String> implements IRelationSorterId {
+ private final static class SorterIdToken extends NamedIdentity<String> implements RelationSorter {
public SorterIdToken(String guid, String name) {
super(guid, name);
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
index b8b050c0cd2..e0d993c72aa 100644
--- 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
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.enums;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -22,27 +22,27 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions;
public class RelationOrderBaseTypes {
//@formatter:off
- public static final IRelationSorterId USER_DEFINED = TokenFactory.createSorterId("AAT0xogoMjMBhARkBZQA", "User Defined");
- public static final IRelationSorterId LEXICOGRAPHICAL_ASC = TokenFactory.createSorterId("AAT1QW4eVE+YuzsoHFAA", "Lexicographical Ascending");
- public static final IRelationSorterId LEXICOGRAPHICAL_DESC = TokenFactory.createSorterId("AAmATn6R9m7VCXQQwuQA", "Lexicographical Descending");
- public static final IRelationSorterId UNORDERED = TokenFactory.createSorterId("AAT1uKZpeDQExlygoIAA", "Unordered");
- public static final IRelationSorterId PREEXISTING = TokenFactory.createSorterId("AE2ypryqoVzNl6EjpgAA", "Preexisting");
+ public static final RelationSorter USER_DEFINED = TokenFactory.createSorterId("AAT0xogoMjMBhARkBZQA", "User Defined");
+ public static final RelationSorter LEXICOGRAPHICAL_ASC = TokenFactory.createSorterId("AAT1QW4eVE+YuzsoHFAA", "Lexicographical Ascending");
+ public static final RelationSorter LEXICOGRAPHICAL_DESC = TokenFactory.createSorterId("AAmATn6R9m7VCXQQwuQA", "Lexicographical Descending");
+ public static final RelationSorter UNORDERED = TokenFactory.createSorterId("AAT1uKZpeDQExlygoIAA", "Unordered");
+ public static final RelationSorter PREEXISTING = TokenFactory.createSorterId("AE2ypryqoVzNl6EjpgAA", "Preexisting");
//@formatter:on
- private static final IRelationSorterId[] values =
- new IRelationSorterId[] {USER_DEFINED, LEXICOGRAPHICAL_ASC, LEXICOGRAPHICAL_DESC, UNORDERED};
+ private static final RelationSorter[] values =
+ new RelationSorter[] {USER_DEFINED, LEXICOGRAPHICAL_ASC, LEXICOGRAPHICAL_DESC, UNORDERED};
private RelationOrderBaseTypes() {
// Constants
}
- public static IRelationSorterId[] values() {
+ public static RelationSorter[] values() {
return values;
}
- public static IRelationSorterId getFromGuid(String guid) throws OseeCoreException {
+ public static RelationSorter getFromGuid(String guid) throws OseeCoreException {
Conditions.checkNotNullOrEmpty(guid, "guid");
- for (IRelationSorterId type : values()) {
+ for (RelationSorter type : values()) {
if (type.getGuid().equals(guid)) {
return type;
}
@@ -50,9 +50,9 @@ public class RelationOrderBaseTypes {
throw new OseeArgumentException("Order type guid does not map to an enum");
}
- public static IRelationSorterId getFromOrderTypeName(String orderTypeName) throws OseeCoreException {
+ public static RelationSorter getFromOrderTypeName(String orderTypeName) throws OseeCoreException {
Conditions.checkNotNullOrEmpty(orderTypeName, "orderTypeName");
- for (IRelationSorterId type : values()) {
+ for (RelationSorter type : values()) {
if (type.getName().equals(orderTypeName)) {
return type;
}
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 6c957b0e804..09eda236c54 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
@@ -22,7 +22,7 @@ import java.util.Map.Entry;
import java.util.Random;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.enums.BranchState;
import org.eclipse.osee.framework.core.enums.BranchType;
@@ -110,7 +110,7 @@ public class RelationTypeSideSorterTest {
@Test
public void test05GetSorterId() throws OseeCoreException {
String sorterGuid = orderData.getCurrentSorterGuid(relationType, relationSide);
- IRelationSorterId expected = sorterProvider.getRelationOrder(sorterGuid).getSorterId();
+ RelationSorter expected = sorterProvider.getRelationOrder(sorterGuid).getSorterId();
Assert.assertNotNull(sorterGuid);
Assert.assertEquals(expected, sorter.getSorterId());
Assert.assertEquals(expected.getGuid(), sorter.getSorterId().getGuid());
@@ -120,7 +120,7 @@ public class RelationTypeSideSorterTest {
@Test
public void test06SorterName() throws OseeCoreException {
String sorterGuid = orderData.getCurrentSorterGuid(relationType, relationSide);
- IRelationSorterId expected = sorterProvider.getRelationOrder(sorterGuid).getSorterId();
+ RelationSorter expected = sorterProvider.getRelationOrder(sorterGuid).getSorterId();
Assert.assertNotNull(sorterGuid);
Assert.assertEquals(expected.getName(), sorter.getSorterName());
}
@@ -175,7 +175,7 @@ public class RelationTypeSideSorterTest {
MockArtifactWithRelations artifactMock = (MockArtifactWithRelations) sorter.getIArtifact();
artifactMock.setRelatedArtifacts(sorter.getRelationType(), startingArtifacts);
- for (IRelationSorterId sorterId : sorterProvider.getAllRelationOrderIds()) {
+ for (RelationSorter sorterId : sorterProvider.getAllRelationOrderIds()) {
IRelationSorter relationSorter = sorterProvider.getRelationOrder(sorterId.getGuid());
List<IArtifact> itemsToOrder = new ArrayList<>(startingArtifacts);
@@ -202,7 +202,7 @@ public class RelationTypeSideSorterTest {
public void test11ToString() throws OseeCoreException {
String artGuid = sorter.getIArtifact().getGuid();
String sorterGuid = orderData.getCurrentSorterGuid(relationType, relationSide);
- IRelationSorterId expectedId = sorterProvider.getRelationOrder(sorterGuid).getSorterId();
+ RelationSorter expectedId = sorterProvider.getRelationOrder(sorterGuid).getSorterId();
String expectedToString =
String.format("Relation Sorter {relationType=%s, relationSide=[%s], artifact=[%s], sorterId=%s}", relationType,
relationSide, artGuid, expectedId);
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 5ba960b5fa9..527aeb7d049 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
@@ -16,7 +16,7 @@ import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.UNORD
import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_DEFINED;
import java.util.Arrays;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
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;
@@ -36,17 +36,17 @@ public class RelationSorterProviderTest {
@Test
public void testGetAllRelationOrderIds() {
RelationSorterProvider provider = new RelationSorterProvider();
- List<IRelationSorterId> actual = provider.getAllRelationOrderIds();
+ List<RelationSorter> actual = provider.getAllRelationOrderIds();
- List<IRelationSorterId> expected =
- Collections.castAll(IRelationSorterId.class, Arrays.asList(RelationOrderBaseTypes.values()));
+ List<RelationSorter> expected =
+ Collections.castAll(RelationSorter.class, Arrays.asList(RelationOrderBaseTypes.values()));
Assert.assertTrue(Collections.isEqual(expected, actual));
}
@Test
public void testGetRelationOrder() throws OseeCoreException {
RelationSorterProvider provider = new RelationSorterProvider();
- for (IRelationSorterId baseType : RelationOrderBaseTypes.values()) {
+ for (RelationSorter baseType : RelationOrderBaseTypes.values()) {
IRelationSorter actual = provider.getRelationOrder(baseType.getGuid());
Assert.assertEquals(baseType, actual.getSorterId());
boolean matches = false;
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 19c05f25d31..dcac289e7e6 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
@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.skynet.core.mocks.DataFactory;
@@ -36,12 +36,12 @@ public class RelationSorterTest {
private final String message;
private final IRelationSorter sorter;
- private final IRelationSorterId expectedOrderId;
+ private final RelationSorter expectedOrderId;
private final List<IArtifact> expectedOrder;
private final List<String> currentItems;
private final List<IArtifact> itemsToOrder;
- public RelationSorterTest(String message, IRelationSorter sorter, IRelationSorterId expectedOrderId, List<String> currentItems, List<IArtifact> itemsToOrder, List<IArtifact> expectedOrder) {
+ public RelationSorterTest(String message, IRelationSorter sorter, RelationSorter expectedOrderId, List<String> currentItems, List<IArtifact> itemsToOrder, List<IArtifact> expectedOrder) {
this.sorter = sorter;
this.message = message;
this.expectedOrderId = expectedOrderId;
@@ -109,7 +109,7 @@ public class RelationSorterTest {
IArtifact art3 = DataFactory.createArtifact(names[2], GUID.create());
IArtifact art4 = DataFactory.createArtifact(names[3], GUID.create());
- IRelationSorterId orderId =
+ RelationSorter orderId =
mode == SortMode.ASCENDING ? RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC : RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC;
List<IArtifact> itemsToOrder = Arrays.asList(art3, art1, art4, art2);
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 489e8059893..b8c0f1c6383 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
@@ -31,7 +31,7 @@ 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.IRelationSorterId;
+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;
@@ -433,11 +433,11 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
addChild(RelationOrderBaseTypes.PREEXISTING, artifact);
}
- public final void addChild(IRelationSorterId sorterId, Artifact artifact) throws OseeCoreException {
+ public final void addChild(RelationSorter sorterId, Artifact artifact) throws OseeCoreException {
addRelation(sorterId, Default_Hierarchical__Child, artifact);
}
- public final Artifact addNewChild(IRelationSorterId sorterId, IArtifactType artifactType, String name) throws OseeCoreException {
+ public final Artifact addNewChild(RelationSorter sorterId, IArtifactType artifactType, String name) throws OseeCoreException {
Artifact child = ArtifactTypeManager.addArtifact(artifactType, branch);
child.setName(name);
addChild(sorterId, child);
@@ -1260,7 +1260,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
linksLoaded = loaded;
}
- public final void addRelation(IRelationSorterId sorterId, IRelationTypeSide relationTypeSide, Artifact artifact, String rationale) throws OseeCoreException {
+ public final void addRelation(RelationSorter sorterId, IRelationTypeSide relationTypeSide, Artifact artifact, String rationale) throws OseeCoreException {
Pair<Artifact, Artifact> sides = determineArtifactSides(artifact, relationTypeSide);
RelationManager.addRelation(sorterId, relationTypeSide, sides.getFirst(), sides.getSecond(), rationale);
}
@@ -1269,11 +1269,11 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
addRelation(RelationOrderBaseTypes.PREEXISTING, relationSide, artifact, null);
}
- public final void addRelation(IRelationSorterId sorterId, IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
+ public final void addRelation(RelationSorter sorterId, IRelationTypeSide relationSide, Artifact artifact) throws OseeCoreException {
addRelation(sorterId, relationSide, artifact, null);
}
- public final void addRelation(IRelationSorterId sorterId, IRelationTypeSide relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd, String rationale) throws OseeCoreException {
+ public final void addRelation(RelationSorter sorterId, IRelationTypeSide relationEnumeration, Artifact targetArtifact, boolean insertAfterTarget, Artifact itemToAdd, String rationale) throws OseeCoreException {
boolean sideA = relationEnumeration.getSide().isSideA();
Artifact artifactA = sideA ? itemToAdd : this;
Artifact artifactB = sideA ? this : itemToAdd;
@@ -1287,7 +1287,7 @@ public class Artifact extends FullyNamedIdentity<String> implements IArtifact, A
artifactsInNewOrder);
}
- public final void setRelationOrder(IRelationTypeSide relationEnumeration, IRelationSorterId orderId) throws OseeCoreException {
+ public final void setRelationOrder(IRelationTypeSide relationEnumeration, RelationSorter orderId) throws OseeCoreException {
if (RelationOrderBaseTypes.USER_DEFINED == orderId) {
setRelationOrder(relationEnumeration, getRelatedArtifacts(relationEnumeration));
} else {
@@ -1332,7 +1332,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(IRelationSorterId sorterId, IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
+ public final void setRelations(RelationSorter sorterId, IRelationTypeSide relationSide, Collection<? extends Artifact> artifacts) throws OseeCoreException {
Collection<Artifact> currentlyRelated = getRelatedArtifacts(relationSide, Artifact.class);
// Remove relations that have been removed
for (Artifact artifact : currentlyRelated) {
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 1859637b4b8..72c9756de67 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
@@ -15,7 +15,7 @@ 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.IRelationSorterId;
+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.model.type.RelationType;
@@ -42,7 +42,7 @@ public class RoughToRealArtifactOperation extends AbstractOperation {
private final IArtifactImportResolver artifactResolver;
private final Map<RoughArtifact, Artifact> roughToRealArtifact;
private final Artifact destinationArtifact;
- private final IRelationSorterId importArtifactOrder;
+ private final RelationSorter importArtifactOrder;
private final boolean deleteUnmatchedArtifacts;
private Collection<Artifact> unmatchedArtifacts;
private final IArtifactExtractor extractor;
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 bbc8b3d976b..b4db42242a2 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
@@ -14,7 +14,7 @@ import static org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes.USER_
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.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
@@ -387,9 +387,9 @@ public class RelationLink implements HasBranch {
RelationOrderData leftData = factory.createRelationOrderData(aArtifact);
RelationOrderData rightData = factory.createRelationOrderData(bArtifact);
- IRelationSorterId leftSorter =
+ RelationSorter leftSorter =
RelationOrderBaseTypes.getFromGuid(leftData.getCurrentSorterGuid(getRelationType(), getSide(aArtifact)));
- IRelationSorterId rightSorter =
+ RelationSorter rightSorter =
RelationOrderBaseTypes.getFromGuid(rightData.getCurrentSorterGuid(getRelationType(), getSide(bArtifact)));
return rightSorter.equals(USER_DEFINED) && leftSorter.equals(USER_DEFINED);
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 73f0f71642a..47f1c211bb5 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
@@ -23,7 +23,7 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+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;
@@ -513,7 +513,7 @@ public class RelationManager {
addRelation(RelationOrderBaseTypes.PREEXISTING, relationType, artifactA, artifactB, rationale);
}
- public static void addRelation(IRelationSorterId sorterId, IRelationType relationTypeToken, Artifact artifactA, Artifact artifactB, String rationale) throws OseeCoreException {
+ public static void addRelation(RelationSorter sorterId, IRelationType relationTypeToken, Artifact artifactA, Artifact artifactB, String rationale) throws OseeCoreException {
Conditions.checkExpressionFailOnTrue(artifactA.equals(artifactB), "Not valid to relate artifact [%s] to itself",
artifactA);
RelationLink relation = relationCache.getLoadedRelation(artifactA, artifactA.getArtId(), artifactB.getArtId(),
@@ -555,7 +555,7 @@ public class RelationManager {
return relationSorterProvider;
}
- public static List<IRelationSorterId> getRelationOrderTypes() {
+ public static List<RelationSorter> getRelationOrderTypes() {
return relationSorterProvider.getAllRelationOrderIds();
}
@@ -567,7 +567,7 @@ public class RelationManager {
return relationOrderFactory.createRelationOrderData(artifact);
}
- public static void setRelationOrder(IArtifact artifact, IRelationType relationType, RelationSide side, IRelationSorterId orderId, List<Artifact> relatives) throws OseeCoreException {
+ public static void setRelationOrder(IArtifact artifact, IRelationType relationType, RelationSide side, RelationSorter orderId, List<Artifact> relatives) throws OseeCoreException {
RelationTypeSideSorter sorter = createTypeSideSorter(artifact, relationType, side);
sorter.setOrder(relatives, orderId);
}
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 e68a658955e..7e752340af9 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
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.relation;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+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.model.RelationTypeSide;
@@ -86,12 +86,12 @@ public class RelationTypeSideSorter extends RelationTypeSide {
return sorterProvider.getRelationOrder(guid);
}
- public IRelationSorterId getSorterId() throws OseeCoreException {
+ public RelationSorter getSorterId() throws OseeCoreException {
return getSorter().getSorterId();
}
public String getSorterName() throws OseeCoreException {
- IRelationSorterId id = getSorterId();
+ RelationSorter id = getSorterId();
return id.getName();
}
@@ -102,8 +102,8 @@ public class RelationTypeSideSorter extends RelationTypeSide {
}
@SuppressWarnings("unchecked")
- public void addItem(IRelationSorterId sorterId, IArtifact itemToAdd) throws OseeCoreException {
- IRelationSorterId sorterIdToUse = sorterId;
+ public void addItem(RelationSorter sorterId, IArtifact itemToAdd) throws OseeCoreException {
+ RelationSorter sorterIdToUse = sorterId;
if (sorterIdToUse == RelationOrderBaseTypes.PREEXISTING) {
sorterIdToUse = getSorterId();
}
@@ -120,8 +120,8 @@ public class RelationTypeSideSorter extends RelationTypeSide {
}
@SuppressWarnings("unchecked")
- public void removeItem(IRelationSorterId sorterId, IArtifact itemToRemove) throws OseeCoreException {
- IRelationSorterId sorterIdToUse = sorterId;
+ public void removeItem(RelationSorter sorterId, IArtifact itemToRemove) throws OseeCoreException {
+ RelationSorter sorterIdToUse = sorterId;
if (sorterIdToUse == null) {
sorterIdToUse = getSorterId();
}
@@ -136,13 +136,13 @@ public class RelationTypeSideSorter extends RelationTypeSide {
setOrder(relatives, sorterIdToUse);
}
- public void setOrder(List<? extends IArtifact> relatives, IRelationSorterId sorterId) throws OseeCoreException {
+ public void setOrder(List<? extends IArtifact> relatives, RelationSorter sorterId) throws OseeCoreException {
orderData.store(getRelationTypeHard(), getSide(), sorterId, relatives);
}
@Override
public String toString() {
- IRelationSorterId sorterId = null;
+ RelationSorter sorterId = null;
try {
sorterId = getSorterId();
} catch (Exception ex) {
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 f77602c1bae..ceb93648976 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.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
/**
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.skynet.core.types.IArtifact;
*/
public interface IRelationSorter {
- IRelationSorterId getSorterId();
+ RelationSorter getSorterId();
void sort(List<? extends IArtifact> relatives, List<String> relativeSequence);
}
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 d35e37cb8ae..46987560031 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
@@ -18,7 +18,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map.Entry;
import org.eclipse.osee.framework.core.data.BranchId;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -88,7 +88,7 @@ public class RelationOrderData {
return lists.get(type.getName(), side.name());
}
- public void addOrderList(IRelationType type, RelationSide side, IRelationSorterId sorterId, List<String> guidList) {
+ public void addOrderList(IRelationType type, RelationSide side, RelationSorter sorterId, List<String> guidList) {
addOrderList(type.getName(), side.name(), sorterId.getGuid(), guidList);
}
@@ -110,11 +110,11 @@ public class RelationOrderData {
return lists.size();
}
- public void store(RelationType type, RelationSide side, IRelationSorterId requestedSorterId, List<? extends IArtifact> relativeSequence) throws OseeCoreException {
+ public void store(RelationType type, RelationSide side, RelationSorter requestedSorterId, List<? extends IArtifact> relativeSequence) throws OseeCoreException {
storeFromGuids(type, side, requestedSorterId, Artifacts.toGuids(relativeSequence));
}
- public void storeFromGuids(RelationType type, RelationSide side, IRelationSorterId requestedSorterId, List<String> relativeSequence) throws OseeCoreException {
+ public void storeFromGuids(RelationType type, RelationSide side, RelationSorter requestedSorterId, List<String> relativeSequence) throws OseeCoreException {
boolean isDifferentSorterId = isDifferentSorterId(type, side, requestedSorterId);
boolean changingRelatives = isRelativeOrderChange(type, side, requestedSorterId, relativeSequence);
if (isDifferentSorterId || changingRelatives) {
@@ -137,16 +137,16 @@ public class RelationOrderData {
}
}
- protected boolean isRevertingToDefaultTypeOrder(RelationType type, RelationSide side, IRelationSorterId sorterId) throws OseeCoreException {
+ protected boolean isRevertingToDefaultTypeOrder(RelationType type, RelationSide side, RelationSorter sorterId) throws OseeCoreException {
String defaultOrderGuid = type.getDefaultOrderTypeGuid();
return sorterId.getGuid().equals(defaultOrderGuid) && isDifferentSorterId(type, side, sorterId);
}
- protected boolean isRelativeOrderChange(IRelationType type, RelationSide side, IRelationSorterId sorterId, List<String> relativeSequence) throws OseeCoreException {
+ 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));
}
- protected boolean isDifferentSorterId(RelationType type, RelationSide side, IRelationSorterId sorterId) throws OseeCoreException {
+ protected boolean isDifferentSorterId(RelationType type, RelationSide side, RelationSorter sorterId) throws OseeCoreException {
String currentSorterGuid = getCurrentSorterGuid(type, side);
return !sorterId.getGuid().equals(currentSorterGuid);
}
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 11eaf7d70ea..a4d232ae508 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
@@ -15,7 +15,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
@@ -41,8 +41,8 @@ public class RelationOrderMergeUtility {
RelationType type = RelationTypeManager.getType(typeSide.getFirst());
RelationSide side = RelationSide.fromString(typeSide.getSecond());
RelationTypeSide rts = new RelationTypeSide(type, side);
- IRelationSorterId leftSorter = RelationOrderBaseTypes.getFromGuid(leftData.getCurrentSorterGuid(type, side));
- IRelationSorterId rightSorter = RelationOrderBaseTypes.getFromGuid(rightData.getCurrentSorterGuid(type, side));
+ RelationSorter leftSorter = RelationOrderBaseTypes.getFromGuid(leftData.getCurrentSorterGuid(type, side));
+ RelationSorter rightSorter = RelationOrderBaseTypes.getFromGuid(rightData.getCurrentSorterGuid(type, side));
List<String> order = null;
if (rightSorter.equals(USER_DEFINED) && leftSorter.equals(USER_DEFINED)) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java
index 04284cf62c6..1001d568d1d 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/order/RelationSorterIdComparator.java
@@ -12,16 +12,16 @@ package org.eclipse.osee.framework.skynet.core.relation.order;
import java.io.Serializable;
import java.util.Comparator;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
/**
* @author Andrew M. Finkbeiner
*/
-public class RelationSorterIdComparator implements Serializable, Comparator<IRelationSorterId> {
+public class RelationSorterIdComparator implements Serializable, Comparator<RelationSorter> {
private static final long serialVersionUID = -8364743688821990429L;
@Override
- public int compare(IRelationSorterId o1, IRelationSorterId o2) {
+ public int compare(RelationSorter o1, RelationSorter o2) {
return o1.getName().compareToIgnoreCase(o2.getName());
}
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 c4785458605..38eb104d76a 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.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.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;
@@ -64,9 +64,9 @@ public class RelationSorterProvider {
return order;
}
- public List<IRelationSorterId> getAllRelationOrderIds() {
+ public List<RelationSorter> getAllRelationOrderIds() {
Collection<IRelationSorter> relationOrder = orderMap.values();
- List<IRelationSorterId> ids = new ArrayList<>();
+ List<RelationSorter> ids = new ArrayList<>();
for (IRelationSorter order : relationOrder) {
ids.add(order.getSorterId());
}
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 41dedca0cb2..df2b5934adf 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
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.relation.sorters;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactNameComparator;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
@@ -29,7 +29,7 @@ public class LexicographicalRelationSorter implements IRelationSorter {
DESCENDING;
}
private final ArtifactNameComparator comparator;
- private final IRelationSorterId id;
+ private final RelationSorter id;
public LexicographicalRelationSorter(SortMode sortMode) {
boolean isDescending = SortMode.DESCENDING == sortMode;
@@ -38,7 +38,7 @@ public class LexicographicalRelationSorter implements IRelationSorter {
}
@Override
- public IRelationSorterId getSorterId() {
+ public RelationSorter getSorterId() {
return id;
}
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 6c97f23f94c..d9416c5821d 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
@@ -11,7 +11,7 @@
package org.eclipse.osee.framework.skynet.core.relation.sorters;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.skynet.core.types.IArtifact;
public class UnorderedRelationSorter implements IRelationSorter {
@Override
- public IRelationSorterId getSorterId() {
+ public RelationSorter getSorterId() {
return RelationOrderBaseTypes.UNORDERED;
}
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 8407f3289eb..eb1aee4c4d8 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
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.relation.sorters;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter;
import org.eclipse.osee.framework.skynet.core.types.IArtifact;
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.types.IArtifact;
public class UserDefinedRelationSorter implements IRelationSorter {
@Override
- public IRelationSorterId getSorterId() {
+ public RelationSorter getSorterId() {
return RelationOrderBaseTypes.USER_DEFINED;
}
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 cdf8db00547..5ab9026fd38 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.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.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;
@@ -43,7 +43,7 @@ public class RelationOrderContributionItem extends ContributionItem {
private static final String MENU_TEXT = "&Order Relations";
public static interface SelectionListener {
- public void onSelected(final RelationTypeSideSorter sorter, final IRelationSorterId wasId, final IRelationSorterId isId);
+ public void onSelected(final RelationTypeSideSorter sorter, final RelationSorter wasId, final RelationSorter isId);
}
private final ISelectionProvider selectionProvider;
@@ -62,8 +62,8 @@ public class RelationOrderContributionItem extends ContributionItem {
final Menu subMenu = new Menu(menu);
relationOrderMenuItem.setMenu(subMenu);
- List<IRelationSorterId> orderTypes = RelationManager.getRelationOrderTypes();
- for (IRelationSorterId id : orderTypes) {
+ List<RelationSorter> orderTypes = RelationManager.getRelationOrderTypes();
+ for (RelationSorter id : orderTypes) {
createMenuItem(subMenu, id);
}
@@ -89,7 +89,7 @@ public class RelationOrderContributionItem extends ContributionItem {
@Override
public void widgetArmed(ArmEvent e) {
- IRelationSorterId sorterId = getSelectedSorterId();
+ RelationSorter sorterId = getSelectedSorterId();
if (sorterId != null) {
String orderGuid = sorterId.getGuid();
for (MenuItem item : subMenu.getItems()) {
@@ -121,7 +121,7 @@ public class RelationOrderContributionItem extends ContributionItem {
return result;
}
- private void notifyListeners(final RelationTypeSideSorter sorter, final IRelationSorterId wasId, final IRelationSorterId isId) {
+ private void notifyListeners(final RelationTypeSideSorter sorter, final RelationSorter wasId, final RelationSorter isId) {
for (SelectionListener listener : listeners) {
try {
listener.onSelected(sorter, wasId, isId);
@@ -136,8 +136,8 @@ public class RelationOrderContributionItem extends ContributionItem {
return true;
}
- private IRelationSorterId getSelectedSorterId() {
- IRelationSorterId sorterId = null;
+ private RelationSorter getSelectedSorterId() {
+ RelationSorter sorterId = null;
RelationTypeSideSorter sorter = getSelected();
if (sorter != null) {
try {
@@ -161,7 +161,7 @@ public class RelationOrderContributionItem extends ContributionItem {
return selectedSorter;
}
- private void createMenuItem(final Menu menu, final IRelationSorterId id) {
+ private void createMenuItem(final Menu menu, final RelationSorter id) {
final MenuItem menuItem = new MenuItem(menu, SWT.CHECK);
menuItem.setText(id.getName());
menuItem.setData(id.getGuid());
@@ -173,7 +173,7 @@ public class RelationOrderContributionItem extends ContributionItem {
RelationTypeSideSorter sorter = getSelected();
if (sorter != null) {
try {
- IRelationSorterId sorterId = sorter.getSorterId();
+ RelationSorter sorterId = sorter.getSorterId();
if (!id.getGuid().equals(sorterId.getGuid())) {
Artifact artifact = sorter.getArtifact();
artifact.setRelationOrder(sorter, id);
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 aaa16058b1f..91b14bfd3bc 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,7 +28,7 @@ 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.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.PresentationType;
import org.eclipse.osee.framework.core.model.RelationTypeSide;
import org.eclipse.osee.framework.core.model.type.RelationType;
@@ -221,7 +221,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact {
contributionItem.addListener(new SelectionListener() {
@Override
- public void onSelected(RelationTypeSideSorter sorter, IRelationSorterId wasId, IRelationSorterId isId) {
+ public void onSelected(RelationTypeSideSorter sorter, RelationSorter wasId, RelationSorter isId) {
editor.onDirtied();
Object parent = ((ITreeContentProvider) treeViewer.getContentProvider()).getParent(sorter);
if (parent != null) {
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 13df3c44995..bd15ad13e22 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
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -189,7 +189,7 @@ public class OrderManagerTest {
assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, orderManager.getSorterId(typeSide2));
- IRelationSorterId actual = orderManager.getSorterId(typeSide3);
+ RelationSorter actual = orderManager.getSorterId(typeSide3);
assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, actual);
}
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 7b56e8d893f..9d232876fd9 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
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+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;
@@ -237,21 +237,21 @@ public class OrderParserTest {
assertEquals(DATA_4, actual);
}
- private void add(Map<IRelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, IRelationSorterId sorter) {
+ private void add(Map<IRelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, RelationSorter sorter) {
add(data, typeId, typeName, side, sorter, java.util.Collections.<String> emptyList());
}
- private void add(Map<IRelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, IRelationSorterId sorter, List<String> list) {
+ private void add(Map<IRelationTypeSide, OrderData> data, Long typeId, String typeName, RelationSide side, RelationSorter sorter, List<String> list) {
IRelationTypeSide typeSide = TokenFactory.createRelationTypeSide(side, typeId, typeName);
OrderData orderData = new OrderData(sorter, list);
data.put(typeSide, orderData);
}
- private void verifyData(int index, Long typeId, RelationSide side, IRelationSorterId sorter) {
+ private void verifyData(int index, Long typeId, RelationSide side, RelationSorter sorter) {
verifyData(index, typeId, side, sorter, java.util.Collections.<String> emptyList());
}
- private void verifyData(int index, Long typeId, RelationSide side, IRelationSorterId sorter, List<String> list) {
+ private void verifyData(int index, Long typeId, RelationSide side, RelationSorter sorter, List<String> list) {
IRelationTypeSide actualTypeSide = typeSideCaptor.getAllValues().get(index);
OrderData actualData = orderDataCaptor.getAllValues().get(index);
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 d25e87b587e..64e3bed2439 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
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.TokenFactory;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
@@ -62,13 +62,13 @@ public class SorterProviderTest {
when(relationTypeCache.getDefaultOrderTypeGuid(CoreRelationTypes.Default_Hierarchical__Child)).thenReturn(
RelationOrderBaseTypes.USER_DEFINED.getGuid());
- IRelationSorterId actual1 = provider.getDefaultSorterId(CoreRelationTypes.Default_Hierarchical__Child);
+ RelationSorter actual1 = provider.getDefaultSorterId(CoreRelationTypes.Default_Hierarchical__Child);
assertEquals(RelationOrderBaseTypes.USER_DEFINED, actual1);
when(relationTypeCache.getDefaultOrderTypeGuid(CoreRelationTypes.Users_User)).thenReturn(
RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC.getGuid());
- IRelationSorterId actual2 = provider.getDefaultSorterId(CoreRelationTypes.Users_User);
+ RelationSorter actual2 = provider.getDefaultSorterId(CoreRelationTypes.Users_User);
assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_DESC, actual2);
}
@@ -92,7 +92,7 @@ public class SorterProviderTest {
@Test
public void testGetAllRelationOrderIds() {
- List<IRelationSorterId> actual = provider.getSorterIds();
+ List<RelationSorter> actual = provider.getSorterIds();
int index = 0;
assertEquals(RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC, actual.get(index++));
@@ -103,7 +103,7 @@ public class SorterProviderTest {
@Test
public void testGetRelationOrder() throws OseeCoreException {
- for (IRelationSorterId sorterId : RelationOrderBaseTypes.values()) {
+ for (RelationSorter sorterId : RelationOrderBaseTypes.values()) {
Sorter actual = provider.getSorter(sorterId);
assertEquals(sorterId, actual.getId());
boolean matches = false;
@@ -134,7 +134,7 @@ public class SorterProviderTest {
public void testNotFoundExceptions() throws OseeCoreException {
String randomGuid = GUID.create();
String idName = "TestSorterId";
- IRelationSorterId sorterId = TokenFactory.createSorterId(randomGuid, "TestSorterId");
+ RelationSorter sorterId = TokenFactory.createSorterId(randomGuid, "TestSorterId");
thrown.expect(OseeArgumentException.class);
thrown.expectMessage(
String.format("sorter cannot be null - Unable to locate sorter with sorterId [%s:%s]", idName, randomGuid));
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 40364c329b5..18ad7689e3c 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
@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.NamedIdentity;
@@ -37,12 +37,12 @@ public class SorterTest {
private final String message;
private final Sorter sorter;
- private final IRelationSorterId expectedOrderId;
+ private final RelationSorter expectedOrderId;
private final List<Identifiable<String>> expectedOrder;
private final List<String> currentItems;
private final List<Identifiable<String>> itemsToOrder;
- public SorterTest(String message, Sorter sorter, IRelationSorterId expectedOrderId, List<String> currentItems, List<Identifiable<String>> itemsToOrder, List<Identifiable<String>> expectedOrder) {
+ public SorterTest(String message, Sorter sorter, RelationSorter expectedOrderId, List<String> currentItems, List<Identifiable<String>> itemsToOrder, List<Identifiable<String>> expectedOrder) {
this.sorter = sorter;
this.message = message;
this.expectedOrderId = expectedOrderId;
@@ -110,7 +110,7 @@ public class SorterTest {
Identifiable<String> art3 = createItem(names[2]);
Identifiable<String> art4 = createItem(names[3]);
- IRelationSorterId orderId;
+ RelationSorter orderId;
if (mode.isAscending()) {
orderId = RelationOrderBaseTypes.LEXICOGRAPHICAL_ASC;
} else {
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 4a971573bf8..ae315864f22 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,7 +14,7 @@ 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.IRelationSorterId;
+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;
@@ -72,9 +72,9 @@ public interface RelationManager {
void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, String rationale) throws OseeCoreException;
- void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, IRelationSorterId sortType) throws OseeCoreException;
+ void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, RelationSorter sortType) throws OseeCoreException;
- void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, String rationale, IRelationSorterId sortType) throws OseeCoreException;
+ void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, String rationale, RelationSorter sortType) throws OseeCoreException;
void setRationale(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, String rationale) throws OseeCoreException;
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 3d581c70088..d0fb565c92b 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
@@ -34,7 +34,7 @@ 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.IRelationSorterId;
+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;
@@ -224,12 +224,12 @@ public class RelationManagerImpl implements RelationManager {
}
@Override
- public void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, IRelationSorterId sortType) throws OseeCoreException {
+ public void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, RelationSorter sortType) throws OseeCoreException {
relate(session, aNode, type, bNode, emptyString(), sortType);
}
@Override
- public void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, String rationale, IRelationSorterId sortType) throws OseeCoreException {
+ public void relate(OrcsSession session, RelationNode aNode, IRelationType type, RelationNode bNode, String rationale, RelationSorter sortType) throws OseeCoreException {
checkBranch(aNode, bNode);
checkRelateSelf(aNode, bNode);
GraphData graph = getGraph(aNode, bNode);
@@ -430,12 +430,12 @@ public class RelationManagerImpl implements RelationManager {
order(session, type, node1, side, RelationOrderBaseTypes.PREEXISTING, op, node2);
}
- private void order(OrcsSession session, IRelationType type, RelationNode node1, RelationSide side, IRelationSorterId sorterId, OrderOp op, Collection<? extends RelationNode> node2) throws OseeCoreException {
+ private void order(OrcsSession session, IRelationType type, RelationNode node1, RelationSide side, RelationSorter sorterId, OrderOp op, Collection<? extends RelationNode> node2) throws OseeCoreException {
OrderManager orderManager = orderFactory.createOrderManager(node1);
RelationSide orderSide = side.oppositeSide();
IRelationTypeSide key = asTypeSide(type, orderSide);
- IRelationSorterId sorterIdToUse = sorterId;
+ RelationSorter sorterIdToUse = sorterId;
if (sorterIdToUse == RelationOrderBaseTypes.PREEXISTING) {
sorterIdToUse = orderManager.getSorterId(key);
}
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 72e0356c2f7..21da29af806 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,27 +12,27 @@ package org.eclipse.osee.orcs.core.internal.relation.order;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
/**
* @author Roberto E. Escobar
*/
public class OrderData {
- private IRelationSorterId sorterId;
+ private RelationSorter sorterId;
private List<String> guids;
- public OrderData(IRelationSorterId sorterId, List<String> guids) {
+ public OrderData(RelationSorter sorterId, List<String> guids) {
super();
this.sorterId = sorterId;
this.guids = guids;
}
- public void setSorterId(IRelationSorterId sorterId) {
+ public void setSorterId(RelationSorter sorterId) {
this.sorterId = sorterId;
}
- public IRelationSorterId getSorterId() {
+ public RelationSorter getSorterId() {
return sorterId;
}
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 5263d80f162..ec2fb77d95e 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
@@ -18,7 +18,7 @@ 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.IRelationSorterId;
+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;
@@ -106,10 +106,10 @@ public class OrderManager implements HasOrderData {
return data != null ? data.getOrderIds() : Collections.<String> emptyList();
}
- public IRelationSorterId getSorterId(IRelationTypeSide typeAndSide) throws OseeCoreException {
+ public RelationSorter getSorterId(IRelationTypeSide typeAndSide) throws OseeCoreException {
Conditions.checkNotNull(typeAndSide, "type and side key");
OrderData data = orderDataMap.get(typeAndSide);
- IRelationSorterId sorterId = null;
+ RelationSorter sorterId = null;
if (data != null) {
sorterId = data.getSorterId();
} else {
@@ -118,13 +118,13 @@ public class OrderManager implements HasOrderData {
return sorterId;
}
- private IRelationSorterId getDefaultSorterId(IRelationType type) throws OseeCoreException {
+ private RelationSorter getDefaultSorterId(IRelationType type) throws OseeCoreException {
return sorterProvider.getDefaultSorterId(type);
}
public void sort(IRelationTypeSide typeAndSide, List<? extends Identifiable<String>> listToOrder) throws OseeCoreException {
if (listToOrder.size() > 1) {
- IRelationSorterId sorterId = getSorterId(typeAndSide);
+ RelationSorter sorterId = getSorterId(typeAndSide);
List<String> relativeOrder = getOrderIds(typeAndSide);
Sorter order = sorterProvider.getSorter(sorterId);
@@ -133,11 +133,11 @@ public class OrderManager implements HasOrderData {
}
public void setOrder(IRelationTypeSide typeAndSide, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
- IRelationSorterId sorterId = getSorterId(typeAndSide);
+ RelationSorter sorterId = getSorterId(typeAndSide);
setOrder(typeAndSide, sorterId, relativeSequence);
}
- public void setOrder(IRelationTypeSide typeAndSide, IRelationSorterId sorterId, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
+ public void setOrder(IRelationTypeSide typeAndSide, RelationSorter sorterId, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
List<String> sequence;
if (!relativeSequence.isEmpty()) {
sequence = new ArrayList<>();
@@ -150,7 +150,7 @@ public class OrderManager implements HasOrderData {
setAndStoreOrder(typeAndSide, sorterId, sequence);
}
- private void setAndStoreOrder(IRelationTypeSide typeAndSide, IRelationSorterId requestedSorterId, List<String> relativeSequence) throws OseeCoreException {
+ private void setAndStoreOrder(IRelationTypeSide typeAndSide, RelationSorter requestedSorterId, List<String> relativeSequence) throws OseeCoreException {
boolean isDifferentSorterId = isDifferentSorterId(typeAndSide, requestedSorterId);
boolean changingRelatives = isRelativeOrderChange(typeAndSide, requestedSorterId, relativeSequence);
@@ -174,17 +174,17 @@ public class OrderManager implements HasOrderData {
accessor.store(this, changeType);
}
- private boolean isDifferentSorterId(IRelationTypeSide typeAndSide, IRelationSorterId newSorterId) throws OseeCoreException {
- IRelationSorterId currentSorter = getSorterId(typeAndSide);
+ private boolean isDifferentSorterId(IRelationTypeSide typeAndSide, RelationSorter newSorterId) throws OseeCoreException {
+ RelationSorter currentSorter = getSorterId(typeAndSide);
return !currentSorter.equals(newSorterId);
}
- private boolean isSetToDefaultSorter(IRelationTypeSide typeAndSide, IRelationSorterId sorterId) throws OseeCoreException {
- IRelationSorterId defaultSorterId = getDefaultSorterId(typeAndSide);
+ private boolean isSetToDefaultSorter(IRelationTypeSide typeAndSide, RelationSorter sorterId) throws OseeCoreException {
+ RelationSorter defaultSorterId = getDefaultSorterId(typeAndSide);
return defaultSorterId.equals(sorterId);
}
- private boolean isRelativeOrderChange(IRelationTypeSide typeAndSide, IRelationSorterId sorterId, List<String> relativeSequence) throws OseeCoreException {
+ private boolean isRelativeOrderChange(IRelationTypeSide typeAndSide, RelationSorter sorterId, List<String> relativeSequence) throws OseeCoreException {
boolean result = false;
if (sorterId.equals(RelationOrderBaseTypes.USER_DEFINED)) {
List<String> currentOrder = getOrderIds(typeAndSide);
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 a2e6697abcb..ef5a3338749 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
@@ -26,7 +26,7 @@ import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+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;
@@ -121,7 +121,7 @@ public class OrderParser {
RelationSide side = RelationSide.fromString(relationSide);
IRelationTypeSide typeSide = TokenFactory.createRelationTypeSide(side, type.getId(), type.getName());
- IRelationSorterId sorterId = RelationOrderBaseTypes.getFromGuid(orderType);
+ RelationSorter sorterId = RelationOrderBaseTypes.getFromGuid(orderType);
OrderData orderData = new OrderData(sorterId, list);
hasOrderData.add(typeSide, orderData);
}
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 18e2a423dbc..84f67750189 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
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.internal.relation.sorter;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.orcs.utility.NameComparator;
@@ -25,7 +25,7 @@ import org.eclipse.osee.orcs.utility.SortOrder;
public class LexicographicalSorter implements Sorter {
private final NameComparator comparator;
- private final IRelationSorterId id;
+ private final RelationSorter id;
public LexicographicalSorter(SortOrder sortOrder) {
this.comparator = new NameComparator(sortOrder);
@@ -37,7 +37,7 @@ public class LexicographicalSorter implements Sorter {
}
@Override
- public IRelationSorterId getId() {
+ public RelationSorter getId() {
return id;
}
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 58a5ccaf694..725981d2034 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.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
/**
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.jdk.core.type.Identifiable;
*/
public interface Sorter {
- IRelationSorterId getId();
+ RelationSorter getId();
void sort(List<? extends Identifiable<String>> relatives, List<String> relativeSequence);
}
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 47f13cf9889..012b3f3f295 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
@@ -17,7 +17,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.Named;
@@ -32,8 +32,8 @@ import org.eclipse.osee.orcs.utility.SortOrder;
*/
public class SorterProvider {
- private final Map<IRelationSorterId, Sorter> orderMap = new HashMap<>();
- private final List<IRelationSorterId> ids = new ArrayList<>();
+ private final Map<RelationSorter, Sorter> orderMap = new HashMap<>();
+ private final List<RelationSorter> ids = new ArrayList<>();
private final RelationTypes typeCache;
@@ -56,7 +56,7 @@ public class SorterProvider {
orderMap.put(order.getId(), order);
}
- public IRelationSorterId getDefaultSorterId(IRelationType relationType) throws OseeCoreException {
+ public RelationSorter getDefaultSorterId(IRelationType relationType) throws OseeCoreException {
Conditions.checkNotNull(relationType, "type");
String orderTypeGuid = typeCache.getDefaultOrderTypeGuid(relationType);
Conditions.checkNotNullOrEmpty(orderTypeGuid, "defaultOrderTypeGuid", "Invalid default order type uuid for [%s]",
@@ -64,16 +64,16 @@ public class SorterProvider {
return RelationOrderBaseTypes.getFromGuid(orderTypeGuid);
}
- public List<IRelationSorterId> getSorterIds() {
+ public List<RelationSorter> getSorterIds() {
return ids;
}
- public boolean exists(IRelationSorterId sorterId) throws OseeCoreException {
+ public boolean exists(RelationSorter sorterId) throws OseeCoreException {
Conditions.checkNotNull(sorterId, "sorterId");
return orderMap.containsKey(sorterId);
}
- public Sorter getSorter(IRelationSorterId sorterId) throws OseeCoreException {
+ public Sorter getSorter(RelationSorter sorterId) throws OseeCoreException {
Conditions.checkNotNull(sorterId, "sorterId");
Sorter sorter = orderMap.get(sorterId);
Conditions.checkNotNull(sorter, "sorter", "Unable to locate sorter with sorterId %s", sorterId);
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 5bcf325a4db..34f4ff89c5e 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
@@ -11,7 +11,7 @@
package org.eclipse.osee.orcs.core.internal.relation.sorter;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
@@ -21,7 +21,7 @@ import org.eclipse.osee.framework.jdk.core.type.Identifiable;
public class UnorderedSorter implements Sorter {
@Override
- public IRelationSorterId getId() {
+ public RelationSorter getId() {
return RelationOrderBaseTypes.UNORDERED;
}
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 83f9c08e8ac..0156d5fbdea 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
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.core.internal.relation.sorter;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.core.data.IRelationSorterId;
+import org.eclipse.osee.framework.core.data.RelationSorter;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.type.Identifiable;
public class UserDefinedSorter implements Sorter {
@Override
- public IRelationSorterId getId() {
+ public RelationSorter getId() {
return RelationOrderBaseTypes.USER_DEFINED;
}
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 e0031eff2da..945f0c7e6e6 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,7 @@ 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.IRelationSorterId;
+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;
@@ -278,12 +278,12 @@ public class TransactionBuilderImpl implements TransactionBuilder {
}
@Override
- public void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, IRelationSorterId sortType) throws OseeCoreException {
+ public void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, RelationSorter sortType) throws OseeCoreException {
txManager.relate(txData, artA, relType, artB, sortType);
}
@Override
- public void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, String rationale, IRelationSorterId sortType) throws OseeCoreException {
+ public void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, String rationale, RelationSorter sortType) throws OseeCoreException {
txManager.relate(txData, artA, relType, artB, rationale, sortType);
}
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 ee36031c717..35d21df681a 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,7 +23,7 @@ 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.IRelationSorterId;
+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.jdk.core.type.OseeCoreException;
@@ -359,13 +359,13 @@ public class TxDataManager {
relationManager.relate(txData.getSession(), asArtifactA, type, asArtifactB, rationale);
}
- public void relate(TxData txData, ArtifactId artA, IRelationType type, ArtifactId artB, IRelationSorterId sortType) throws OseeCoreException {
+ public void relate(TxData txData, ArtifactId artA, IRelationType type, ArtifactId artB, RelationSorter sortType) throws OseeCoreException {
Artifact asArtifactA = getForWrite(txData, artA);
Artifact asArtifactB = getForWrite(txData, artB);
relationManager.relate(txData.getSession(), asArtifactA, type, asArtifactB, sortType);
}
- public void relate(TxData txData, ArtifactId artA, IRelationType type, ArtifactId artB, String rationale, IRelationSorterId sortType) throws OseeCoreException {
+ public void relate(TxData txData, ArtifactId artA, IRelationType type, ArtifactId artB, String rationale, RelationSorter sortType) throws OseeCoreException {
Artifact asArtifactA = getForWrite(txData, artA);
Artifact asArtifactB = getForWrite(txData, artB);
relationManager.relate(txData.getSession(), asArtifactA, type, asArtifactB, rationale, sortType);
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 36159ecfe69..6e5acb83f01 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,7 +19,7 @@ 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.IRelationSorterId;
+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;
@@ -122,9 +122,9 @@ public interface TransactionBuilder {
void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, String rationale) throws OseeCoreException;
- void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, IRelationSorterId sortType) throws OseeCoreException;
+ void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, RelationSorter sortType) throws OseeCoreException;
- void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, String rationale, IRelationSorterId sortType) throws OseeCoreException;
+ void relate(ArtifactId artA, IRelationType relType, ArtifactId artB, String rationale, RelationSorter sortType) throws OseeCoreException;
void setRelations(ArtifactId artA, IRelationType relType, Iterable<? extends ArtifactId> artBs) throws OseeCoreException;

Back to the top