From 135329fcb6fdfd546e6743cbdbf4c23aebb4dbfb Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Fri, 30 Jul 2021 14:31:09 +0200 Subject: [PATCH] fix #9728 completing bean property Team.nomenclaturalTitleCache --- .../cdm/model/agent/INomenclaturalAuthor.java | 16 +++++++++++++--- .../eu/etaxonomy/cdm/model/agent/Person.java | 4 ++++ .../java/eu/etaxonomy/cdm/model/agent/Team.java | 11 ++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/INomenclaturalAuthor.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/INomenclaturalAuthor.java index 47419fbebb..0a49eeb6bf 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/INomenclaturalAuthor.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/INomenclaturalAuthor.java @@ -18,14 +18,24 @@ package eu.etaxonomy.cdm.model.agent; public interface INomenclaturalAuthor { /** - * @see TeamOrPersonBase#getNomenclaturalTitleCache() + * @see {@link TeamOrPersonBase#getNomenclaturalTitleCache()} + * */ - public String getNomenclaturalTitleCache(); + public String getNomenclaturalTitleCache(); /** - * @see getNomenclaturalTitleCache() + * @see {@link #getNomenclaturalTitleCache()} + * @deprecated to be replaced by {@link #getNomenclaturalTitleCache()} */ + @Deprecated public void setNomenclaturalTitle(String nomenclaturalTitle); + /** + * fixes the missing setter method that corresponds to {@link #getNomenclaturalTitleCache()} see #9729 + * + * @see {@link TeamOrPersonBase#getNomenclaturalTitleCache()} + */ + public void setNomenclaturalTitleCache(String nomenclaturalTitle); + } diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java index 6a37267fba..a00bea7bdc 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java @@ -351,6 +351,10 @@ public class Person extends TeamOrPersonBase{ public void setNomenclaturalTitle(String nomenclaturalTitle) { this.nomenclaturalTitle = isBlank(nomenclaturalTitle) ? null : nomenclaturalTitle; } + @Override + public void setNomenclaturalTitleCache(String nomenclaturalTitle) { + this.nomenclaturalTitle = isBlank(nomenclaturalTitle) ? null : nomenclaturalTitle; + } /** * Returns the initials of this person as used in bibliographic diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java index dfd19e15b0..b9983a3d95 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java @@ -323,19 +323,24 @@ public class Team extends TeamOrPersonBase { * and protects it from overwriting. * This method overrides {@link TeamOrPersonBase#setNomenclaturalTitle(String) setNomenclaturalTitle}. * - * @see #getNomenclaturalTitle() - * @see #setNomenclaturalTitle(String, boolean) + * @see {@link #getNomenclaturalTitleCache()} + * @see {@link #setNomenclaturalTitleCache(String, boolean)} */ @Override public void setNomenclaturalTitle(String nomenclaturalTitle) { this.setNomenclaturalTitleCache(nomenclaturalTitle, PROTECTED); } + @Override + public void setNomenclaturalTitleCache(String nomenclaturalTitle) { + this.setNomenclaturalTitleCache(nomenclaturalTitle, PROTECTED); + } + /** * Assigns a {@link TeamOrPersonBase#nomenclaturalTitle nomenclatural identification} string to this team * and a protection flag status to this string. * - * @see #getNomenclaturalTitle() + * @see {@link #getNomenclaturalTitleCache()} */ public void setNomenclaturalTitleCache(String nomenclaturalTitleCache, boolean protectedNomenclaturalTitleCache) { firePropertyChange("nomenclaturalTitleCache", this.nomenclaturalTitleCache, nomenclaturalTitleCache); -- 2.34.1