Project

General

Profile

« Previous | Next » 

Revision 1c39686b

Added by Andreas Müller about 5 years ago

ref #8162 adapt cdmlip to new term package structure

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationshipType.java
24 24

  
25 25
import eu.etaxonomy.cdm.model.common.Language;
26 26
import eu.etaxonomy.cdm.model.common.RelationshipTermBase;
27
import eu.etaxonomy.cdm.model.common.TermType;
28
import eu.etaxonomy.cdm.model.common.TermVocabulary;
27
import eu.etaxonomy.cdm.model.term.TermType;
28
import eu.etaxonomy.cdm.model.term.TermVocabulary;
29 29

  
30 30
/**
31 31
 * The class representing the categories of {@link HybridRelationship hybrid relationships}
......
46 46
 * </ul>
47 47
 *
48 48
 * @author m.doering
49
 * @version 1.0
50 49
 * @since 08-Nov-2007 13:06:27
51 50
 */
52 51
@XmlAccessorType(XmlAccessType.FIELD)
......
54 53
@XmlRootElement(name = "HybridRelationshipType")
55 54
@Entity
56 55
//@Indexed disabled to reduce clutter in indexes, since this type is not used by any search
57
//@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase")
56
//@Indexed(index = "eu.etaxonomy.cdm.model.term.DefinedTermBase")
58 57
@Audited
59 58
public class HybridRelationshipType extends RelationshipTermBase<HybridRelationshipType> {
60 59
	private static final long serialVersionUID = 5225908742890437668L;
......
105 104

  
106 105
//************************** METHODS ********************************
107 106

  
108
	/* (non-Javadoc)
109
	 * @see eu.etaxonomy.cdm.model.common.DefinedTermBase#resetTerms()
110
	 */
111 107
	@Override
112 108
	public void resetTerms(){
113 109
		termMap = null;
114 110
	}
115 111

  
116

  
117 112
	protected static HybridRelationshipType getTermByUuid(UUID uuid){
118 113
        if (termMap == null || termMap.isEmpty()){
119 114
            return getTermByClassAndUUID(HybridRelationshipType.class, uuid);
......
221 216
	 * For nomenclature purposes a "major parent" is also a "second parent".
222 217
	 * Major and minor parent relationships are usually represented in a
223 218
	 * hybrid formula with a "greater than" symbol (>). It replaces the multiplication
224
	 * symbol which is generally used for hybrid fromulas.
219
	 * symbol which is generally used for hybrid formulas.
225 220
	 *
226 221
	 * @see	#SECOND_PARENT()
227 222
	 */
......
243 238
		}
244 239
	}
245 240

  
246
//	@Override
247
//	public HybridRelationshipType readCsvLine(Class<HybridRelationshipType> termClass, List<String> csvLine, Map<UUID,DefinedTermBase> terms) {
248
//		return super.readCsvLine(termClass, csvLine, terms);
249
//	}
250

  
251 241
}

Also available in: Unified diff