refactor: Parameterize the Identifiable interface

Change-Id: I683fcc68f7201174bdb36ee98d285899e254e4ae

11 files changed, 18 insertions, 18 deletions

diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/Attribute.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/Attribute.java
index 65f5c9fc446..944b376d5e6 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/Attribute.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/Attribute.java
@@ -43,6 +43,6 @@ public interface Attribute<T> extends OrcsWriteable, AttributeReadable<T>, HasOr
 
    void internalInitialize(AttributeTypes attributeTypeCache, Reference<AttributeContainer> containerReference, AttributeData attributeData, boolean isDirty, boolean setDefaultValue) throws OseeCoreException;
 
-   Identifiable getContainer() throws OseeStateException;
+   Identifiable<String> getContainer() throws OseeStateException;
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeContainer.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeContainer.java
index 0f5b458e757..bd58954a1fe 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeContainer.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeContainer.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.orcs.data.HasLocalId;
 /**
  * @author Roberto E. Escobar
  */
-public interface AttributeContainer extends Identifiable, HasLocalId {
+public interface AttributeContainer extends Identifiable<String>, HasLocalId {
 
    void add(IAttributeType type, Attribute<? extends Object> attribute);
 
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/GraphNode.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/GraphNode.java
index 4ac8ff1b1cd..65b9f39bdbf 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/GraphNode.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/GraphNode.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.orcs.data.HasLocalId;
  * @author Roberto E. Escobar
  * @author Megumi Telles
  */
-public interface GraphNode extends Identifiable, HasLocalId, HasBranch {
+public interface GraphNode extends Identifiable<String>, HasLocalId, HasBranch {
 
    void setGraph(GraphData graph);
 
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 a6ad6058466..391b27460ac 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
@@ -403,10 +403,10 @@ public class RelationManagerImpl implements RelationManager {
       if (sorterIdToUse == RelationOrderBaseTypes.PREEXISTING) {
          sorterIdToUse = orderManager.getSorterId(key);
       }
-      List<Identifiable> relatives = Collections.emptyList();
+      List<Identifiable<String>> relatives = Collections.emptyList();
       if (RelationOrderBaseTypes.USER_DEFINED == sorterIdToUse) {
          ResultSet<RelationNode> arts = getRelated(session, graph, type, node1, side);
-         relatives = new LinkedList<Identifiable>();
+         relatives = new LinkedList<Identifiable<String>>();
          for (RelationNode art : arts) {
             relatives.add(art);
          }
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 853747b6122..282357972fb 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
@@ -122,7 +122,7 @@ public class OrderManager implements HasOrderData {
       return sorterProvider.getDefaultSorterId(type);
    }
 
-   public void sort(IRelationTypeSide typeAndSide, List<? extends Identifiable> listToOrder) throws OseeCoreException {
+   public void sort(IRelationTypeSide typeAndSide, List<? extends Identifiable<String>> listToOrder) throws OseeCoreException {
       if (listToOrder.size() > 1) {
          IRelationSorterId sorterId = getSorterId(typeAndSide);
          List<String> relativeOrder = getOrderIds(typeAndSide);
@@ -132,16 +132,16 @@ public class OrderManager implements HasOrderData {
       }
    }
 
-   public void setOrder(IRelationTypeSide typeAndSide, List<? extends Identifiable> relativeSequence) throws OseeCoreException {
+   public void setOrder(IRelationTypeSide typeAndSide, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
       IRelationSorterId sorterId = getSorterId(typeAndSide);
       setOrder(typeAndSide, sorterId, relativeSequence);
    }
 
-   public void setOrder(IRelationTypeSide typeAndSide, IRelationSorterId sorterId, List<? extends Identifiable> relativeSequence) throws OseeCoreException {
+   public void setOrder(IRelationTypeSide typeAndSide, IRelationSorterId sorterId, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException {
       List<String> sequence;
       if (!relativeSequence.isEmpty()) {
          sequence = new ArrayList<String>();
-         for (Identifiable item : relativeSequence) {
+         for (Identifiable<String> item : relativeSequence) {
             sequence.add(item.getGuid());
          }
       } else {
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 3c3ab8c3309..44eed0adff0 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
@@ -42,7 +42,7 @@ public class LexicographicalSorter implements Sorter {
    }
 
    @Override
-   public void sort(List<? extends Identifiable> relatives, List<String> relativeSequence) {
+   public void sort(List<? extends Identifiable<String>> relatives, List<String> relativeSequence) {
       Collections.sort(relatives, comparator);
    }
 }
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 68ba31999a1..511ddde47a1 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
@@ -21,5 +21,5 @@ public interface Sorter {
 
    IRelationSorterId getId();
 
-   void sort(List<? extends Identifiable> relatives, List<String> relativeSequence);
+   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/UnorderedSorter.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UnorderedSorter.java
index 9a383c5a728..74b5b04ed82 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
@@ -26,7 +26,7 @@ public class UnorderedSorter implements Sorter {
    }
 
    @Override
-   public void sort(List<? extends Identifiable> relatives, List<String> relativeSequence) {
+   public void sort(List<? extends Identifiable<String>> relatives, List<String> relativeSequence) {
       // do nothing
    }
 }
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java
index 6cd64f383b5..7287887cfe7 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java
@@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.data.Identifiable;
 /**
  * @author Andrew M. Finkbeiner
  */
-public class UserDefinedComparator implements Comparator<Identifiable> {
+public class UserDefinedComparator implements Comparator<Identifiable<String>> {
 
    private final Map<String, Integer> value;
 
@@ -31,7 +31,7 @@ public class UserDefinedComparator implements Comparator<Identifiable> {
    }
 
    @Override
-   public int compare(Identifiable object1, Identifiable object2) {
+   public int compare(Identifiable<String> object1, Identifiable<String> object2) {
       Integer val1 = getIndex(object1);
       Integer val2 = getIndex(object2);
       if (val1 == null) {
@@ -43,7 +43,7 @@ public class UserDefinedComparator implements Comparator<Identifiable> {
       return val1 - val2;
    }
 
-   private Integer getIndex(Identifiable object) {
+   private Integer getIndex(Identifiable<String> object) {
       Integer toReturn = null;
       if (object != null) {
          toReturn = value.get(object.getGuid());
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 576ad5b5c28..28d5fb94718 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
@@ -27,7 +27,7 @@ public class UserDefinedSorter implements Sorter {
    }
 
    @Override
-   public void sort(List<? extends Identifiable> relatives, List<String> relativeSequence) {
+   public void sort(List<? extends Identifiable<String>> relatives, List<String> relativeSequence) {
       if (!relatives.isEmpty()) {
          Collections.sort(relatives, new UserDefinedComparator(relativeSequence));
       }
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java
index 71ed4db6f6a..55f4b284343 100644
--- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java
+++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java
@@ -234,12 +234,12 @@ public class QueryBuilderImpl implements QueryBuilder {
    }
 
    @Override
-   public QueryBuilder andIds(Identifiable... ids) throws OseeCoreException {
+   public QueryBuilder andIds(Identifiable<String>... ids) throws OseeCoreException {
       return andIds(Arrays.asList(ids));
    }
 
    @Override
-   public QueryBuilder andIds(Collection<? extends Identifiable> ids) throws OseeCoreException {
+   public QueryBuilder andIds(Collection<? extends Identifiable<String>> ids) throws OseeCoreException {
       Set<String> guids = new HashSet<String>();
       for (Identity<String> id : ids) {
          guids.add(id.getGuid());