merge-update from trunk

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / strategy / cache / reference / JournalDefaultCacheStrategy.java

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 44a30a7bbcf8c376ec68e60f72154149579ef874..106a8f1a46e96faf91de6335bf1909162b188874 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
@@ -16,7 +16,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.reference.IJournal;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.strategy.StrategyBase;\r
 \r
@@ -24,7 +23,10 @@ import eu.etaxonomy.cdm.strategy.StrategyBase;
  * @author a.mueller\r
  * @created 29.06.2008\r
  */\r
-public class JournalDefaultCacheStrategy<T extends Reference> extends StrategyBase implements IReferenceBaseCacheStrategy<T> {\r
+public class JournalDefaultCacheStrategy extends StrategyBase implements IReferenceBaseCacheStrategy {\r
+       private static final long serialVersionUID = 8495999505123620960L;\r
+\r
+\r
        @SuppressWarnings("unused")\r
        private static final Logger logger = Logger.getLogger(JournalDefaultCacheStrategy.class);\r
 \r
@@ -53,7 +55,7 @@ public class JournalDefaultCacheStrategy<T extends Reference> extends StrategyBa
         * @return\r
         */\r
        public static JournalDefaultCacheStrategy NewInstance(){\r
-               return new JournalDefaultCacheStrategy<Reference>();\r
+               return new JournalDefaultCacheStrategy();\r
        }\r
        \r
        /**\r
@@ -65,7 +67,7 @@ public class JournalDefaultCacheStrategy<T extends Reference> extends StrategyBa
        \r
 \r
        @Override\r
-       public String getTitleCache(T journal) {\r
+       public String getTitleCache(Reference journal) {\r
                return getTitleCache(journal, false);\r
                \r
 \r
@@ -73,12 +75,12 @@ public class JournalDefaultCacheStrategy<T extends Reference> extends StrategyBa
        \r
 \r
        @Override\r
-       public String getAbbrevTitleCache(T journal) {\r
+       public String getAbbrevTitleCache(Reference journal) {\r
                return getTitleCache(journal, true);\r
        }\r
        \r
        \r
-       private String getTitleCache(T journal, boolean isAbbrev){\r
+       private String getTitleCache(Reference journal, boolean isAbbrev){\r
                if (journal == null){\r
                        return null;\r
                }\r
@@ -95,7 +97,7 @@ public class JournalDefaultCacheStrategy<T extends Reference> extends StrategyBa
 //             result = addYear(result, journal);\r
                \r
                \r
-               TeamOrPersonBase<?> team = journal.getAuthorTeam();\r
+               TeamOrPersonBase<?> team = journal.getAuthorship();\r
                if (team != null){\r
                        String author = CdmUtils.getPreferredNonEmptyString(team.getTitleCache(), team.getNomenclaturalTitle(), isAbbrev, true);\r
                        if (StringUtils.isNotBlank(author)){\r
@@ -106,10 +108,10 @@ public class JournalDefaultCacheStrategy<T extends Reference> extends StrategyBa
        }\r
 \r
        \r
-       public String getCitation(T referenceBase) {\r
+       public String getCitation(Reference referenceBase) {\r
                StringBuilder stringBuilder = new StringBuilder();\r
                \r
-               TeamOrPersonBase<?> team = referenceBase.getAuthorTeam();\r
+               TeamOrPersonBase<?> team = referenceBase.getAuthorship();\r
                if (team != null &&  ! (team.getTitleCache() == null) && ! team.getTitleCache().trim().equals("")){\r
                        //String author = CdmUtils.Nz(team == null? "" : team.getTitleCache());\r
                        stringBuilder.append(team.getTitleCache() + afterAuthor);\r