Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Institution.java
17 17
import javax.persistence.FetchType;
18 18
import javax.persistence.ManyToMany;
19 19
import javax.persistence.ManyToOne;
20
import javax.validation.constraints.NotNull;
21 20
import javax.validation.constraints.Size;
22 21
import javax.xml.bind.annotation.XmlAccessType;
23 22
import javax.xml.bind.annotation.XmlAccessorType;
......
37 36
import org.hibernate.search.annotations.Indexed;
38 37
import org.springframework.beans.factory.annotation.Configurable;
39 38

  
39
import eu.etaxonomy.cdm.strategy.cache.agent.InstitutionDefaultCacheStrategy;
40 40
import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
41
import eu.etaxonomy.cdm.strategy.cache.common.IdentifiableEntityDefaultCacheStrategy;
42 41
import eu.etaxonomy.cdm.validation.annotation.NullOrNotEmpty;
43 42

  
44 43
/**
......
110 109
	 */
111 110
	public Institution() {
112 111
		super();
113
		this.cacheStrategy = new IdentifiableEntityDefaultCacheStrategy<Institution>();
112
		this.cacheStrategy = new InstitutionDefaultCacheStrategy();
114 113
	}
115 114

  
116 115
	/** 
......
165 164
	 * @param  isPartOf  the parent institution
166 165
	 * @see	   #getIsPartOf()
167 166
	 */
168
	public void setIsPartOf(Institution isPartOf){
169
		this.isPartOf = isPartOf;
167
	public void setIsPartOf(Institution parentInstitution){
168
		this.isPartOf = parentInstitution;
170 169
	}
171 170

  
172 171
	/**

Also available in: Unified diff