ref #6401 Adapt generics in agent base and others

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/AgentBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/AgentBase.java
index 686933bbe3e81096fd81f688d0d777e1f9bf9cf0..7eab09dcf78e4e55664bc166e565eb1313ab514c 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/AgentBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/AgentBase.java
@@ -57,7 +57,7 @@ import eu.etaxonomy.cdm.strategy.merge.MergeMode;
 @Entity
 @Audited
 @Table(appliesTo="AgentBase", indexes = { @Index(name = "agentTitleCacheIndex", columnNames = { "titleCache" }) })
-public abstract class AgentBase<S extends IIdentifiableEntityCacheStrategy<?>> extends IdentifiableMediaEntity<S> implements IMergable, IMatchable, Cloneable{
+public abstract class AgentBase<S extends IIdentifiableEntityCacheStrategy<? extends AgentBase<S>>> extends IdentifiableMediaEntity<S> implements IMergable, IMatchable, Cloneable{
        private static final long serialVersionUID = 7732768617469448829L;
        @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(AgentBase.class);

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
index 7e0b01d6fda590618102385d5d20e4473ad4560f..881d20a4614ad23218b4d36c30b103aed86e78e6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
@@ -40,7 +40,7 @@ import eu.etaxonomy.cdm.strategy.cache.agent.INomenclaturalAuthorCacheStrategy;
 })
 @Entity
 @Audited
-public abstract class TeamOrPersonBase<T extends TeamOrPersonBase<?>> extends AgentBase<INomenclaturalAuthorCacheStrategy<T>> implements INomenclaturalAuthor {
+public abstract class TeamOrPersonBase<T extends TeamOrPersonBase<T>> extends AgentBase<INomenclaturalAuthorCacheStrategy<T>> implements INomenclaturalAuthor {
     private static final long serialVersionUID = 5216821307314001961L;
     public static final Logger logger = Logger.getLogger(TeamOrPersonBase.class);
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
index b261c4965c6fc010b060db68bfd5920a0f63e692..0c5aed7e497143d7b8417c51e69a79664e877fba 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
@@ -57,7 +57,7 @@ import eu.etaxonomy.cdm.validation.annotation.NoDuplicateNames;
 @NameMustHaveAuthority(groups = Level2.class)
 @NoDuplicateNames(groups = Level3.class)
 public class NonViralName<T extends NonViralName<?>>
-        extends TaxonNameBase<T, INonViralNameCacheStrategy<?>>{
+        extends TaxonNameBase<T, INonViralNameCacheStrategy<T>>{
 
     private static final long serialVersionUID = -9083811681449792683L;