Project

General

Profile

« Previous | Next » 

Revision d26c2ef9

Added by Anahit Babadshanjan over 15 years ago

Opportunity to omit term loading during DB initialization.
Use @Qualifier to fix bean creation error.

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java
13 13
import java.util.HashMap;
14 14
import java.util.Map;
15 15

  
16
import eu.etaxonomy.cdm.jaxb.MultilanguageSetAdapter;
16
import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;
17 17
import eu.etaxonomy.cdm.model.common.Language;
18 18
import eu.etaxonomy.cdm.model.common.LanguageString;
19
import eu.etaxonomy.cdm.model.common.MultilanguageSet;
19
import eu.etaxonomy.cdm.model.common.MultilanguageText;
20 20

  
21 21
import org.apache.log4j.Logger;
22 22
import org.hibernate.annotations.Cascade;
......
50 50

  
51 51
	//@XmlElement(name = "MultiLanguageText", type = MultilanguageSet.class)
52 52
	@XmlElement(name = "MultiLanguageText")
53
    @XmlJavaTypeAdapter(MultilanguageSetAdapter.class)
53
    @XmlJavaTypeAdapter(MultilanguageTextAdapter.class)
54 54
	private Map<Language, LanguageString> multiLanguageText;
55 55
	
56 56
	@XmlElement(name = "Format")
......
133 133
	
134 134
	private void initTextSet(){
135 135
		if (multiLanguageText == null){
136
			multiLanguageText = MultilanguageSet.NewInstance();
136
			multiLanguageText = MultilanguageText.NewInstance();
137 137
		}
138 138
	}
139 139
	

Also available in: Unified diff