Revision e6d7b501
Added by Andreas Müller almost 7 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/MustHaveAuthorityValidator.java | ||
---|---|---|
12 | 12 |
import javax.validation.ConstraintValidator; |
13 | 13 |
import javax.validation.ConstraintValidatorContext; |
14 | 14 |
|
15 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
|
16 | 15 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
17 | 16 |
import eu.etaxonomy.cdm.validation.annotation.NameMustHaveAuthority; |
18 | 17 |
|
... | ... | |
28 | 27 |
|
29 | 28 |
if(name.getBasionymAuthorship() == null && name.getAuthorshipCache() == null) { |
30 | 29 |
valid = false; |
31 |
if(name.isInstanceOf(BotanicalName.class) && name.isInfraSpecific()) {
|
|
30 |
if(name.isBotanical() && name.isInfraSpecific()) {
|
|
32 | 31 |
if(name.isAutonym() ) { |
33 | 32 |
valid = true; // is AUTONYM |
34 | 33 |
} |
... | ... | |
39 | 38 |
|
40 | 39 |
} else { |
41 | 40 |
valid = true; |
42 |
if(name.isInstanceOf(BotanicalName.class) && name.isInfraSpecific()) {
|
|
41 |
if(name.isBotanical() && name.isInfraSpecific()) {
|
|
43 | 42 |
if(name.isAutonym()) { |
44 | 43 |
valid = false; // is AUTONYM |
45 | 44 |
} |
Also available in: Unified diff
ref #6368 remove TaxonNameBase subclasses