Merge branch 'release/5.8.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / checklist / e4 / StatusComboBoxDataProvider.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
index 77fc37aff5aed445e099cbb282f4924f48cf547e..4162a16d2a8e3945fb97f3fa8dab095426d4cfc7 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
@@ -69,11 +69,11 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
 
 
     public static List<?> getValues(CdmPreference pref){
-        List<DefinedTermBase> inputAll = new ArrayList<>();
+        List<StatusHelper> inputAll = new ArrayList<>();
         PresenceAbsenceTerm noneTerm = PresenceAbsenceTerm.NewInstance();
         noneTerm.setTitleCache(" - ", true);
         noneTerm.addRepresentation(Representation.NewInstance(" - ", " ", " ", CdmStore.getDefaultLanguage()));
-        inputAll.add(noneTerm);
+        inputAll.add(new StatusHelper(noneTerm));
         String statusString = pref.getValue();
 
         List<PresenceAbsenceTerm> inputList;
@@ -93,8 +93,11 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
         Comparator<DefinedTermBase> comp = new OrderedTermComparator<>();
         Collections.sort(inputList, comp);
         Collections.sort(inputList, Collections.reverseOrder());
-
-        inputAll.addAll(1, inputList);
+        int index = 1;
+        for (PresenceAbsenceTerm term: inputList){
+            inputAll.add(index, new StatusHelper(term));
+        }
+       // inputAll.addAll(1, inputList);
         return inputAll;
     }