X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/51db8d4af699558def1502b5c63a1d1afc2050b1..2a1795298ee03b33ec07613db01bc6389f3d7628:/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 daaf139ada..de46f8749b 100644
--- 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
@@ -34,7 +34,6 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
-import org.apache.lucene.document.Field.Index;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Type;
@@ -85,6 +84,25 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
 	@IndexedEmbedded(depth = 2)
 	protected Set<T> terms = getNewTermSet();
 	
+// ********************************* FACTORY METHODS *****************************************/
+
+	public static TermVocabulary NewInstance(String description, String label, String abbrev, String termSourceUri){
+		return new TermVocabulary(description, label, abbrev, termSourceUri);
+	}
+	
+// ************************* CONSTRUCTOR *************************************************	
+
+	protected TermVocabulary() {
+	}
+	
+	protected TermVocabulary(String term, String label, String labelAbbrev, String termSourceUri) {
+		super(term, label, labelAbbrev);
+		setTermSourceUri(termSourceUri);
+	}
+	
+
+// ******************* METHODS *************************************************/	
+	
 	public T findTermByUuid(UUID uuid){
 		for(T t : terms) {
 			if(t.getUuid().equals(uuid)) {
@@ -94,15 +112,6 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
 		return null;
 	}
 
-	public TermVocabulary(String term, String label, String labelAbbrev, String termSourceUri) {
-		super(term, label, labelAbbrev);
-		setTermSourceUri(termSourceUri);
-	}
-	
-	public TermVocabulary() {
-		// TODO Auto-generated constructor stub
-	}
-	
 	@Transient
 	Set<T> getNewTermSet() {
 		return new HashSet<T>();
@@ -117,8 +126,8 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
 		this.terms.add(term);
 	}
 	public void removeTerm(T term) {
-		term.setVocabulary(null);
 		this.terms.remove(term);
+		term.setVocabulary(null);
 	}
 
 	public String getTermSourceUri() {
@@ -129,24 +138,6 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
 	}
 	
 	
-//	// inner iterator class for the iterable interface
-//	private class TermIterator<T> implements Iterator<T> {
-//		   // FIXME: using a list here is probably not safe. Sth passed by value, an array, would be better
-//		   // but arrays cause generics problems: http://forum.java.sun.com/thread.jspa?threadID=651276&messageID=3832182
-//		   // hack for now ;(
-//		   private Set<T> array;
-//		   private int i= 0;
-//		   // ctor
-//		   public TermIterator(Set<T> array) {
-//		      // check for null being passed in etc.
-//		      this.array= array;
-//		   }
-//		   // interface implementation
-//		   public boolean hasNext() { return i < array.size(); }
-//		   public T next() { return array.get(i++); }
-//		   public void remove() { throw new UnsupportedOperationException(); }
-//	}
-
 	public Iterator<T> iterator() {
 		return terms.iterator();  // OLD: new TermIterator<T>(this.terms);
 	}
@@ -176,7 +167,7 @@ public class TermVocabulary<T extends DefinedTermBase> extends TermBase implemen
 	 * @see eu.etaxonomy.cdm.model.common.ILoadableTerm#readCsvLine(java.util.List)
 	 */
 	public TermVocabulary<T> readCsvLine(List<String> csvLine) {
-		return readCsvLine(csvLine, Language.ENGLISH());
+		return readCsvLine(csvLine, Language.CSV_LANGUAGE());
 	}
 	
 	public TermVocabulary<T> readCsvLine(List<String> csvLine, Language lang) {