Performed project cleanup.

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

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
index 8260192b06c57ad76fef151a8cded07fb378c8ac..3d57da5c4f93bdf80042c28d70a849414d8f0f37 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java
@@ -21,12 +21,13 @@ import javax.persistence.*;
 
 /**
  * A single enumeration must only contain DefinedTerm instances of one kind
- * (=class)
+ * (this means a subclass of DefinedTerm).
  * @author m.doering
  * @version 1.0
  * @created 08-Nov-2007 13:06:23
  */
 @Entity
+@Inheritance(strategy=InheritanceType.SINGLE_TABLE)
 public class TermVocabulary<T extends DefinedTermBase> extends TermBase implements Iterable<T> {
        static Logger logger = Logger.getLogger(TermVocabulary.class);
        
@@ -42,10 +43,11 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
 //             }
 //             return termVocabularyMap.get(uuid);
                //TODO
+               logger.error("Not yet implemented");
                return null;
        }
        public static final TermVocabulary getUUID(UUID uuid){
-               return (TermVocabulary)findByUuid(uuid);
+               return findByUuid(uuid);
        }
        public static final TermVocabulary LANGUAGE(){
                return getUUID(uuidLanguage);
@@ -57,7 +59,8 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
        private String termSourceUri;
        protected Class termClass;
 
-       protected Set<T> terms = getNewTermSet();
+       //TODO Changed
+       public Set<T> terms = getNewTermSet();
        
        //to be overriden by subclasses, e.g. OrderedTermVocabulary
        @Transient
@@ -68,22 +71,31 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
        public TermVocabulary() {
                super();
        }
-       public TermVocabulary(String term, String label, String termSourceUri) {
-               super(term, label);
+       public TermVocabulary(String term, String label, String labelAbbrev, String termSourceUri) {
+               super(term, label, labelAbbrev);
                setTermSourceUri(termSourceUri);
        }
        
-       @OneToMany(mappedBy="vocabulary")
-       @Type(type="DefinedTermBase")
-       @Cascade({CascadeType.SAVE_UPDATE})
+       @Transient
        public Set<T> getTerms() {
-               Set<T> result = getNewTermSet();
-               result.addAll(terms);
-               return result;
+               //Set<T> result = getNewTermSet();
+               //result.addAll(terms);
+               //return result;
+               return terms;
        }
        protected void setTerms(Set<T> terms) {
                this.terms = terms;
        }
+       
+       @OneToMany(mappedBy="persistentVocabulary", fetch=FetchType.LAZY)
+       @Type(type="DefinedTermBase")
+       @Cascade({CascadeType.SAVE_UPDATE})
+       public Set<T> getPersistentTerms() {
+               return terms;
+       }
+       protected void setPersistentTerms(Set<T> terms) {
+               this.terms = terms;
+       }
        public void addTerm(T term) throws WrongTermTypeException {
                if (terms.size()<1){
                        // no term yet in the list. First term defines the vocabulary kind
@@ -139,5 +151,36 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
        public int size(){
                return terms.size();
        }
+       
+       
+       /**
+        * Returns all terms of this vocabulary sorted by their representation defined by the given language.
+        * If such an representation does not exist, the representation of the default language is testing instead for ordering.
+        * @param language
+        * @return
+        */
+       @Transient
+       public SortedSet<T> getTermsOrderedByLabels(Language language){
+               TermLanguageComparator<T> comp = new TermLanguageComparator<T>();
+               comp.setCompareLanguage(language);
+               
+               SortedSet<T> result = new TreeSet<T>(comp);
+               result.addAll(getTerms());
+               return result;
+       }
+       
+       
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.model.common.ILoadableTerm#readCsvLine(java.util.List)
+        */
+       public TermVocabulary readCsvLine(List<String> csvLine) {
+               return readCsvLine(csvLine, Language.ENGLISH());
+       }
+       public TermVocabulary readCsvLine(List<String> csvLine, Language lang) {
+               this.setUuid(UUID.fromString(csvLine.get(0)));
+               this.setUri(csvLine.get(1));
+               //this.addRepresentation(Representation.NewInstance(csvLine.get(3), csvLine.get(2).trim(), lang) );
+               return this;
+       }
     
 }
\ No newline at end of file