ref #6794 reduce calls to isLower and isHigher in Rank class in vaadin

diff --git a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java
index 3f7fa36c1edbfc305ff21735633630001fa7d10a..32c1369ba998793bd4d9709de733abc7c07111f9 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java
+++ b/src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java
@@ -32,7 +32,7 @@ import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.Rank;
+import eu.etaxonomy.cdm.model.name.RankClass;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
@@ -266,7 +266,7 @@ public class RegistrationRequiredDataInserter extends AbstractDataInserter {
                taxa = new ArrayList<>();
 
                for(TaxonName name : page.getRecords()){
-                   if(name.getRank() != null && name.getRank().isLower(Rank.GENUS())){
+                   if(name.getRank() != null && name.getRank().isLowerThan(RankClass.Genus)){
                        NomenclaturalStatusType illegitimType = findILegitimateStatusType(name);
                        if(illegitimType == null){
                            Taxon taxon;

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
index e6b3ca5b4efd1f0bdfa525fc549ec6f9aaa6e83f..777e48f3cd71ca7eda07871330f8c5389d85579f 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
@@ -844,7 +844,7 @@ public class TaxonNamePopupEditor
         Rank rank = (Rank) rankSelect.getValue();
 
         @SuppressWarnings("deprecation")
-        boolean isSpeciesOrBelow = !rank.isHigher(Rank.SPECIES()) && !rank.getRankClass().equals(RankClass.Unknown);
+        boolean isSpeciesOrBelow =  rank.isLowerOrEqualTo(RankClass.Species);
         Boolean withBasionymSection = BooleanUtils.isTrue(basionymToggle.getValue());
         Boolean withValidationSection = BooleanUtils.isTrue(validationToggle.getValue());
         Boolean withOrthographicCorrectionSection = BooleanUtils.isTrue(orthographicVariantToggle.getValue());