some generics

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/JournalDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/JournalDefaultCacheStrategy.java
index d1d40fab47cab2dbc42d4f4d3b4e0add9c4258be..c6a57654548c21916b847a041b80254ee43bee9f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/JournalDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/JournalDefaultCacheStrategy.java
@@ -15,7 +15,6 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;\r
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;\r
 import eu.etaxonomy.cdm.model.reference.Journal;\r
 import eu.etaxonomy.cdm.strategy.StrategyBase;\r
 \r
@@ -24,8 +23,9 @@ import eu.etaxonomy.cdm.strategy.StrategyBase;
  * @created 29.06.2008\r
  * @version 1.0\r
  */\r
-public class JournalDefaultCacheStrategy<T extends Journal> extends StrategyBase<JournalDefaultCacheStrategy<T>> implements IReferenceBaseCacheStrategy<T> {\r
-       private static Logger logger = Logger.getLogger(JournalDefaultCacheStrategy.class);\r
+public class JournalDefaultCacheStrategy<T extends Journal> extends StrategyBase implements IReferenceBaseCacheStrategy<T> {\r
+       @SuppressWarnings("unused")\r
+       private static final Logger logger = Logger.getLogger(JournalDefaultCacheStrategy.class);\r
 \r
        \r
        protected String beforeYear = ". ";\r
@@ -52,7 +52,7 @@ public class JournalDefaultCacheStrategy<T extends Journal> extends StrategyBase
         * @return\r
         */\r
        public static JournalDefaultCacheStrategy NewInstance(){\r
-               return new JournalDefaultCacheStrategy();\r
+               return new JournalDefaultCacheStrategy<Journal>();\r
        }\r
        \r
        /**\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
index 7258be4db9f81504f870760e1836c2c7ccbc6d7e..b13c9aedcff793a4dd0c2c3db2a512baad026f7f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
@@ -53,7 +53,7 @@ public abstract class NomRefDefaultCacheStrategyBase<T extends ReferenceBase> ex
                }\r
                String result =  getNomRefTitleWithoutYearAndAuthor(nomenclaturalReference);\r
                result = addYear(result, nomenclaturalReference);\r
-               TeamOrPersonBase team = nomenclaturalReference.getAuthorTeam();\r
+               TeamOrPersonBase<?> team = nomenclaturalReference.getAuthorTeam();\r
                if (team != null &&  ! (team.getTitleCache() == null) && ! team.getTitleCache().trim().equals("")){\r
                        //String author = CdmUtils.Nz(team == null? "" : team.getTitleCache());\r
                        result = team.getTitleCache() + afterAuthor + result;\r