bug[ats_ATS228117]: Add ResultSet.getList
Change-Id: Ib38d9abeb6416665b7534f03f4f605309336b1a8
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 2749d8c..94223c0 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 @@
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 f7ccb5d..5ea787a 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 @@
@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 c94e24e..d46e83e 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 @@
return result;
}
- private List<T> getList() {
+ @Override
+ public List<T> getList() {
return data;
}
@@ -88,4 +89,5 @@
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 cb60daa..bb2ce0d 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 @@
@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;
+ }
}