Revision 230f5b70
Added by Andreas Müller almost 2 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java | ||
|---|---|---|
| 43 | 43 |
import eu.etaxonomy.cdm.strategy.cache.TagEnum; |
| 44 | 44 |
import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper; |
| 45 | 45 |
import eu.etaxonomy.cdm.vaadin.component.ButtonFactory; |
| 46 |
import eu.etaxonomy.cdm.vaadin.model.registration.RegistrationTermLists.TypeDesignationStatusBaseComparator;
|
|
| 46 |
import eu.etaxonomy.cdm.vaadin.model.registration.RegistrationTermLists.RegistrationTypeDesignationStatusComparator;
|
|
| 47 | 47 |
import eu.etaxonomy.cdm.vaadin.permission.PermissionDebugUtils; |
| 48 | 48 |
import eu.etaxonomy.vaadin.component.CompositeStyledComponent; |
| 49 | 49 |
|
| ... | ... | |
| 122 | 122 |
// order the typeDesignationSet keys so that holotypes come first, etc |
| 123 | 123 |
List<TypedEntityRefWithStatus> baseRefsByHighestStatus = new ArrayList<>(); |
| 124 | 124 |
for(VersionableEntity baseEntityRef : typeDesignationSets.keySet()) {
|
| 125 |
baseRefsByHighestStatus.add(new TypedEntityRefWithStatus(baseEntityRef, typeDesignationSets.get(baseEntityRef).highestTypeStatus(new TypeDesignationStatusBaseComparator())));
|
|
| 125 |
baseRefsByHighestStatus.add(new TypedEntityRefWithStatus(baseEntityRef, typeDesignationSets.get(baseEntityRef).highestTypeStatus(new RegistrationTypeDesignationStatusComparator())));
|
|
| 126 | 126 |
} |
| 127 | 127 |
|
| 128 | 128 |
Collections.sort(baseRefsByHighestStatus); |
| ... | ... | |
| 296 | 296 |
|
| 297 | 297 |
public VersionableEntity typedEntity; |
| 298 | 298 |
public TypeDesignationStatusBase<?> status; |
| 299 |
private TypeDesignationStatusBaseComparator comparator = new TypeDesignationStatusBaseComparator();
|
|
| 299 |
private RegistrationTypeDesignationStatusComparator comparator = new RegistrationTypeDesignationStatusComparator();
|
|
| 300 | 300 |
|
| 301 | 301 |
public TypedEntityRefWithStatus(VersionableEntity typedEntity, |
| 302 | 302 |
TypeDesignationStatusBase<?> status) {
|
| src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/RegistrationTermLists.java | ||
|---|---|---|
| 98 | 98 |
return uuids; |
| 99 | 99 |
} |
| 100 | 100 |
|
| 101 |
public static class TypeDesignationStatusBaseComparator implements Comparator<TypeDesignationStatusBase<?>> {
|
|
| 101 |
public static class RegistrationTypeDesignationStatusComparator implements Comparator<TypeDesignationStatusBase<?>> {
|
|
| 102 | 102 |
|
| 103 | 103 |
@Override |
| 104 | 104 |
public int compare(TypeDesignationStatusBase<?> o1, TypeDesignationStatusBase<?> o2) {
|
Also available in: Unified diff
rename RegistrationTypeDesignationStatusComparator