add html tagged full title

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/INameCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/INameCacheStrategy.java
index 5201aa545244d33f1c2b39c102eadf80291f0548..4ff8b0fc67e3a6b9ff6e79a59576498b8a974c22 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/INameCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/INameCacheStrategy.java
@@ -62,6 +62,16 @@ public interface INameCacheStrategy<T extends TaxonNameBase> extends IIdentifiab
      */\r
     public String getFullTitleCache(T taxonNameBase);\r
 \r
      */\r
     public String getFullTitleCache(T taxonNameBase);\r
 \r

+\r
+       /**\r
+        * Returns the full title cache tagged by html tags according to tag rules.\r
+        * @param nonViralName\r
+        * @param htmlTagRules\r
+        * @return\r
+        */\r
+       public String getFullTitleCache(T nonViralName, HTMLTagRules htmlTagRules);\r
+\r
+    \r

     /**\r
      * Returns the name cache as a string.\r
      * @param taxonNameBase\r
     /**\r
      * Returns the name cache as a string.\r
      * @param taxonNameBase\r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
index 07a57445ecaf5a521ba1fccaca3df48875e12108..efc0fa111b4ef8adb639f3edfd961afd5e3abe0f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java
@@ -191,6 +191,20 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
                    return result;\r
                }\r
     }\r
                    return result;\r
                }\r
     }\r

+    \r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy#getFullTitleCache(eu.etaxonomy.cdm.model.name.TaxonNameBase, eu.etaxonomy.cdm.strategy.cache.HTMLTagRules)\r
+        */\r
+       @Override\r
+       public String getFullTitleCache(T nonViralName, HTMLTagRules htmlTagRules) {\r
+               List<TaggedText> tags = getTaggedFullTitle(nonViralName);\r
+           if (tags == null){\r
+               return null;\r
+           }else{\r
+               String result = createString(tags, htmlTagRules);\r
+               return result;\r
+           }\r
+       }\r

 \r
 \r
        /* (non-Javadoc)\r
 \r
 \r
        /* (non-Javadoc)\r


@@ -198,13 +212,7 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
      */\r
     @Override\r
     public String getFullTitleCache(T nonViralName) {\r
      */\r
     @Override\r
     public String getFullTitleCache(T nonViralName) {\r

-        List<TaggedText> tags = getTaggedFullTitle(nonViralName);\r
-        if (tags == null){\r
-            return null;\r
-        }else{\r
-            String result = createString(tags);\r
-            return result;\r
-        }\r
+       return getFullTitleCache(nonViralName, null);\r

     }\r
 \r
 \r
     }\r
 \r
 \r


@@ -900,4 +908,5 @@ public class NonViralNameDefaultCacheStrategy<T extends NonViralName> extends Na
         }\r
     }\r
 \r
         }\r
     }\r
 \r

+\r

 }\r
 }\r