(no commit message)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
index ce5927e08ab71da2d7c0eeed349640732274f437..b5d3aefbde1852d616d46a96c30bff4d8fe29bf8 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
@@ -68,6 +68,11 @@ public abstract class IdentifiableEntity<T extends IdentifiableEntity> extends A
                return titleCache;
        }
        public void setTitleCache(String titleCache){
+               //TODO truncation of title cach
+               if (titleCache != null && titleCache.length() > 254){
+                       logger.warn("Truncation of title cache: " + this.toString());
+                       titleCache = titleCache.substring(0, 252) + "...";
+               }
                this.titleCache = titleCache;
                this.setProtectedTitleCache(PROTECTED);
        }

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java
index c08e9de7f3bc7de6f9fe928a22c8d618cd9269fe..8805a89ddadfef56fdecdbfbf63d16ebe8117ee6 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Marker.java
@@ -33,8 +33,8 @@ public class Marker extends VersionableEntity {
        
        /**
         * Factory method
-        * @param text
-        * @param lang
+        * @param markerType The type of the marker
+        * @param flag The value of the marker
         * @return
         */
        public static Marker NewInstance(MarkerType markerType, boolean flag){

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java
index 7e75b708dee51ab7d0230b30559aeacaa4997efe..a4c845235b89ef296f5a12b061c019690baa1cf7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java
@@ -9,9 +9,7 @@
 
 package eu.etaxonomy.cdm.model.reference;
 
-
 import org.apache.log4j.Logger;
-
 import javax.persistence.*;
 
 /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
index 0da77b09c37c50594dc1532aa231509e9ee1f7ee..283ead57fc21709893fb57a42ce5d8cc6ec0b0fd 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java
@@ -11,18 +11,11 @@ package eu.etaxonomy.cdm.model.reference;
 
 
 import eu.etaxonomy.cdm.model.agent.Agent;
-import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.cdm.model.common.IMediaDocumented;
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifyableMediaEntity;
-import eu.etaxonomy.cdm.model.common.Media;
 
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
-
-import java.util.*;
-
 import javax.persistence.*;
 
 /**