bug[ats_ATS228117]: Add ResultSet.getList0.23.0.v201510131829_RC

Change-Id: Ib38d9abeb6416665b7534f03f4f605309336b1a8

4 files changed, 26 insertions, 11 deletions

diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSet.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSet.java
index 2749d8c4302..94223c0dbd5 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSet.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSet.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.framework.jdk.core.type;
 
 import java.util.Comparator;
+import java.util.List;
 
 /**
  * @author Ryan D. Brooks
@@ -30,4 +31,6 @@ public interface ResultSet<T> extends Iterable<T> {
 
    ResultSet<T> sort(Comparator<T> comparator);
 
+   List<T> getList();
+
 }
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetIterable.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetIterable.java
index f7ccb5d07ca..5ea787a62eb 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetIterable.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetIterable.java
@@ -102,13 +102,18 @@ public class ResultSetIterable<T> implements ResultSet<T> {
 
    @Override
    public ResultSet<T> sort(Comparator<T> comparator) {
-      List<T> list = new LinkedList<>();
-      for (T item : data) {
-         list.add(item);
-      }
-
+      List<T> list = getList();
       Collections.sort(list, comparator);
       data = list;
       return this;
    }
+
+   @Override
+   public List<T> getList() {
+      List<T> items = new LinkedList<>();
+      for (T obj : data) {
+         items.add(obj);
+      }
+      return items;
+   }
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetList.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetList.java
index c94e24e2dcd..d46e83e7de3 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetList.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetList.java
@@ -56,7 +56,8 @@ public class ResultSetList<T> implements ResultSet<T> {
       return result;
    }
 
-   private List<T> getList() {
+   @Override
+   public List<T> getList() {
       return data;
    }
 
@@ -88,4 +89,5 @@ public class ResultSetList<T> implements ResultSet<T> {
       Collections.sort(getList(), comparator);
       return this;
    }
+
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetTransform.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetTransform.java
index cb60daa5351..bb2ce0d62a6 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetTransform.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/ResultSetTransform.java
@@ -110,13 +110,18 @@ public class ResultSetTransform<I, F extends Identity<I>, T extends Identity<I>>
 
    @Override
    public ResultSet<T> sort(Comparator<T> comparator) {
-      List<T> list = new LinkedList<>();
-      Iterator<T> iter = iterator();
-      while (iter.hasNext()) {
-         list.add(iter.next());
-      }
+      List<T> list = getList();
       Collections.sort(list, comparator);
       data = list;
       return this;
    }
+
+   @Override
+   public List<T> getList() {
+      List<T> items = new LinkedList<>();
+      for (T obj : data) {
+         items.add(obj);
+      }
+      return items;
+   }
 }