fix #5874: display of infrageneric epithet are different for zoological and botanical...
authorKatja Luther <k.luther@bgbm.org>
Thu, 15 Sep 2016 09:50:27 +0000 (11:50 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 15 Sep 2016 09:53:09 +0000 (11:53 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java

index 7c100632860954514d0661c51f4ac8eacf2f0b9a..84a1ae49eab28540008315bfe5e37a004f15136e 100644 (file)
@@ -179,8 +179,14 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
        }
 
        private void createInfragenerericEpithetControls(ICdmFormElement element, NonViralName nonViralName, int style){
-               if((nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS())) && !nonViralName.getRank().isLower(Rank.SPECIES())){
-                       text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
+               if (nonViralName.getNomenclaturalCode().equals(NomenclaturalCode.ICZN)){
+                       if(nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS()) ){
+                               text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
+                       }
+               } else{
+                       if((nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS())) && !nonViralName.getRank().isLower(Rank.SPECIES()) && !nonViralName.getRank().isSpeciesAggregate()){
+                               text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
+                       }
                }
        }