feature[ats_18K4T]: Sorting of results, programs, and builds

2 files changed, 24 insertions, 3 deletions

diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
index 7af4d50e679..c932fa2f9e4 100644
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
+++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.osee.orcs.search.QueryBuilder;
 import org.eclipse.osee.orcs.search.QueryFactory;
 import org.eclipse.osee.orcs.search.ResultSet;
 import org.eclipse.osee.orcs.search.StringOperator;
+import com.google.common.collect.Lists;
 import com.google.common.collect.MapMaker;
 
 /**
@@ -123,13 +124,15 @@ public class ArtifactProviderImpl implements ArtifactProvider {
    }
 
    @Override
-   public Collection<RelationType> getValidRelationTypes(ReadableArtifact art) throws OseeCoreException {
+   public List<RelationType> getValidRelationTypes(ReadableArtifact art) throws OseeCoreException {
       Collection<IRelationTypeSide> existingRelationTypes = graph.getExistingRelationTypes(art);
       Set<RelationType> toReturn = new HashSet<RelationType>();
       for (IRelationTypeSide side : existingRelationTypes) {
          toReturn.add(graph.getFullRelationType(side));
       }
-      return toReturn;
+      List<RelationType> listToReturn = Lists.newLinkedList(toReturn);
+      Collections.sort(listToReturn);
+      return listToReturn;
    }
 
    @Override
@@ -156,9 +159,12 @@ public class ArtifactProviderImpl implements ArtifactProvider {
             delta = System.currentTimeMillis();
          }
          try {
-            List<Match<ReadableArtifact, ReadableAttribute<?>>> filtered = Collections.emptyList();
+            List<Match<ReadableArtifact, ReadableAttribute<?>>> filtered = null;
             if (result.getList() != null) {
                filtered = sanitizer.filter(result.getList());
+               Utility.sortResults(filtered);
+            } else {
+               filtered = Collections.emptyList();
             }
             callback.onSearchComplete(filtered);
          } catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java
index 840da4b3865..d81f2c6876d 100644
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java
+++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/Utility.java
@@ -24,6 +24,9 @@ import org.eclipse.osee.display.api.data.StyledText;
 import org.eclipse.osee.framework.core.data.Named;
 import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.orcs.data.ReadableArtifact;
+import org.eclipse.osee.orcs.data.ReadableAttribute;
+import org.eclipse.osee.orcs.search.Match;
 
 /**
  * @author Roberto E. Escobar
@@ -46,6 +49,18 @@ public final class Utility {
       return toSort;
    }
 
+   public static List<Match<ReadableArtifact, ReadableAttribute<?>>> sortResults(List<Match<ReadableArtifact, ReadableAttribute<?>>> toSort) {
+      Collections.sort(toSort, new Comparator<Match<ReadableArtifact, ReadableAttribute<?>>>() {
+
+         @Override
+         public int compare(Match<ReadableArtifact, ReadableAttribute<?>> o1, Match<ReadableArtifact, ReadableAttribute<?>> o2) {
+            return o1.getItem().getName().compareTo(o2.getItem().getName());
+         }
+
+      });
+      return toSort;
+   }
+
    public static List<StyledText> getMatchedText(String data, List<MatchLocation> matches) {
       List<StyledText> text = new ArrayList<StyledText>();
       if (matches.isEmpty()) {