(no commit message)

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / common / LanguageString.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java
index b759baacd0a14ea261941d43f7b3c10df0dd9074..75b6ea9ee6e1f9420736af7a1400d8f864c9ae79 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java
@@ -9,12 +9,7 @@
 
 package eu.etaxonomy.cdm.model.common;
 
-
 import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.CascadeType;
-
-import java.util.*;
 import javax.persistence.*;
 
 /**
@@ -22,11 +17,9 @@ import javax.persistence.*;
  * @version 1.0
  * @created 08-Nov-2007 13:06:32
  */
-@MappedSuperclass
-public class LanguageString  extends VersionableEntity{
+@Entity
+public class LanguageString  extends LanguageStringBase{
        static Logger logger = Logger.getLogger(LanguageString.class);
-       protected String text;
-       private Language language;
 
        public static LanguageString NewInstance(String text, Language language){
                return new LanguageString(text, language);
@@ -35,44 +28,31 @@ public class LanguageString  extends VersionableEntity{
        protected LanguageString() {
                super();
        }
-
+       
        protected LanguageString(String text, Language language) {
-               super();
-               this.setLanguage(language);
-               this.setText(text);
-               
+               super(text, language);
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.model.common.CdmBase#toString()
+        */
+       @Override
+       public String toString() {
+               if (text == null){
+                       return super.toString() + "null";
+               }else{
+                       String languagePart = "";
+                       if (this.language != null){
+                               languagePart = "(" + this.language.toString() + ")";
+                       }
+                       if (text.length() > 20){
+                               return text.substring(0, 20) + "..." + languagePart;
+                       }else{
+                               return text + languagePart;
+                       }
+               }
        }
        
-       @ManyToOne
-       //@Cascade({CascadeType.SAVE_UPDATE})
-       public Language getLanguage(){
-               return this.language;
-       }
-       public void setLanguage(Language language){
-               this.language = language;
-       }
-
-       public String getText(){
-               return this.text;
-       }
-       protected void setText(String text) {
-               this.text = text;
-       }
        
-       @Transient
-       public String getLanguageLabel(){
-               return this.language.getRepresentation(Language.DEFAULT()).getLabel();
-       }
-       @Transient
-       public String getLanguageLabel(Language lang){
-               return this.language.getRepresentation(lang).getLabel();
-       }
-       @Transient
-       public String getLanguageText(){
-               return this.language.getRepresentation(Language.DEFAULT()).getLabel();
-       }
-       @Transient
-       public String getLanguageText(Language lang){
-               return this.language.getRepresentation(lang).getLabel();
-       }
+       
 }
\ No newline at end of file