Project

General

Profile

« Previous | Next » 

Revision 16aed412

Added by Andreas Müller about 5 years ago

cleanup and MultilanguageText.add(Language, String) added

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/PersistentMultiLanguageText.java
5 5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/ 
8
*/
9 9

  
10 10
package eu.etaxonomy.cdm.model.common;
11 11

  
......
14 14
import org.hibernate.collection.internal.PersistentMap;
15 15
import org.hibernate.engine.spi.SessionImplementor;
16 16

  
17
public class PersistentMultiLanguageText extends PersistentMap implements IMultiLanguageText {
18
	private static final long serialVersionUID = -7104619652295153920L;
17
public class PersistentMultiLanguageText
18
            extends PersistentMap
19
            implements IMultiLanguageText {
20

  
21
    private static final long serialVersionUID = -7104619652295153920L;
19 22

  
20 23
	public PersistentMultiLanguageText(SessionImplementor sessionImplementor, MultilanguageText collection) {
21 24
		super(sessionImplementor, collection);
......
25 28
		super();
26 29
	}
27 30

  
28
	/* (non-Javadoc)
29
	 * @see eu.etaxonomy.cdm.model.common.IMultiLanguageText#add(eu.etaxonomy.cdm.model.common.LanguageString)
30
	 */
31
	@Deprecated
32
	public LanguageString add(LanguageString languageString) {
31
	@Override
32
    public LanguageString put(LanguageString languageString) {
33 33
		if (languageString == null){
34 34
			return null;
35 35
		}else{
......
37 37
		}
38 38
	}
39 39

  
40
	public LanguageString put(LanguageString languageString) {
41
		if (languageString == null){
42
			return null;
43
		}else{
44
			return (LanguageString)super.put(languageString.getLanguage(), languageString);
45
		}
40
	@Override
41
	public LanguageString put(Language language, String text){
42
	    LanguageString languageString = new LanguageString(text, language);
43
	    put(languageString);
44
	    return languageString;
46 45
	}
47
	
48
	public LanguageString getPreferredLanguageString(List<Language> languages) {
46

  
47
	@Override
48
    public LanguageString getPreferredLanguageString(List<Language> languages) {
49 49
		LanguageString languageString = null;
50 50
		for (Language language : languages) {
51 51
			languageString = (LanguageString)super.get(language);
......
56 56
		return (LanguageString)super.get(Language.DEFAULT());
57 57
	}
58 58

  
59
	public String getText(Language language) {
59
	@Override
60
    public String getText(Language language) {
60 61
		LanguageString languageString = (LanguageString)super.get(language);
61 62
		if (languageString != null){
62 63
			return languageString.getText();

Also available in: Unified diff