more tests and features for #476: Implement free-text search methods for TaxonBase...

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / description / State.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
index 2dde9351383aec21fbde9005f2db352c24db6fab..9200214b1c48d15aee0c597a872017914091f6e4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/State.java
@@ -10,19 +10,24 @@
 package eu.etaxonomy.cdm.model.description;
 
 
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.OrderedTermBase;
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-
-import org.apache.log4j.Logger;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.log4j.Logger;
+import org.hibernate.envers.Audited;
+import org.hibernate.search.annotations.Indexed;
+
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.OrderedTermBase;
+import eu.etaxonomy.cdm.model.common.TermVocabulary;
+
 /**
  * This class represents terms describing different states (like "oval" or
  * "triangular") for {@link Feature features} that can be described with
@@ -36,9 +41,15 @@ import javax.xml.bind.annotation.XmlType;
 @XmlType(name = "State")
 @XmlRootElement(name = "State")
 @Entity
+@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
+@Audited
 public class State extends OrderedTermBase<State> {
-       static Logger logger = Logger.getLogger(State.class);
+       private static final long serialVersionUID = -4816292463790262516L;
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(State.class);
 
+       protected static Map<UUID, State> termMap = null;       
+       
        // ************* CONSTRUCTORS *************/    
        /** 
         * Class constructor: creates a new empty state.
@@ -46,7 +57,6 @@ public class State extends OrderedTermBase<State> {
         * @see #State(String, String, String)
         */
        public State() {
-               super();
        }
 
        /** 
@@ -88,6 +98,24 @@ public class State extends OrderedTermBase<State> {
        public static State NewInstance(String term, String label, String labelAbbrev){
                return new State(term, label, labelAbbrev);
        }
+
+//************************** METHODS ********************************
+       
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
+        */
+       @Override
+       public void resetTerms(){
+               termMap = null;
+       }
+
        
+       @Override
+       protected void setDefaultTerms(TermVocabulary<State> termVocabulary){
+               termMap = new HashMap<UUID, State>();
+               for (State term : termVocabulary.getTerms()){
+                       termMap.put(term.getUuid(), term); 
+               }
+       }
 
 }
\ No newline at end of file