ref #9762: cultivar group for cultivar and cultivar group and rank handling

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index b95b1e8039455e2a86eb9b44b819ec138b6abed3..08b46d4d46e550d3f1b8670bdd15c699436534b7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -178,7 +178,11 @@ public class NameDetailElement
                        switch(code){
                        case ICNAFP :
                                //nothing do add
-                               createBotanicalNameParts(formElement, nonViralName, style);
+                           if (nonViralName.getRank().isCultivar()){
+                               createCultivarNameParts(formElement, nonViralName, style);
+                           }else{
+                               createBotanicalNameParts(formElement, nonViralName, style);
+                           }
                                break;
                        case Fungi :
                                if (config == null){
@@ -221,15 +225,17 @@ public class NameDetailElement
                cultivarRanks.add(Rank.CULTIVAR());
                cultivarRanks.add(Rank.CULTIVARGROUP());
                cultivarRanks.add(Rank.GREX());
-
-               combo_rank.setTerms(cultivarRanks);
+               if (cultivarName.isCultivar()){
+                   combo_rank.setTerms(cultivarRanks);
+               }
+               combo_rank.setSelection(cultivarName.getRank());
 
                if (cultivarName.getRank().equals(Rank.CULTIVAR()) || cultivarName.getRank().equals(Rank.CULTIVARGROUP())){
-                   text_cultivarName = formFactory.createTextWithLabelElement(formElement, "Cultivar Name", cultivarName.getCultivarEpithet(), style);
-               }
-               if(cultivarName.getRank().equals(Rank.CULTIVARGROUP())){
                    text_cultivarGroup = formFactory.createTextWithLabelElement(formElement, "Cultivar Group", cultivarName.getCultivarGroupEpithet(), style);
                }
+               if(cultivarName.getRank().equals(Rank.CULTIVAR())){
+                   text_cultivarName = formFactory.createTextWithLabelElement(formElement, "Cultivar Name", cultivarName.getCultivarEpithet(), style);
+               }
        }
 
        private void createBotanicalNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){