Project

General

Profile

Revision a88787bf

IDa88787bf6f7ba04a21aa86b621f1c8dbbf68b3e6
Parent 94d72025
Child 9cadeef4

Added by Andreas Müller over 1 year ago

cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IMultiLanguageTextHolder.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
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
*/
......
11 11

  
12 12

  
13 13
/**
14
 * This interface was merely created to get convenient access to all classes 
15
 * that hold a MultiLanguageString, i.e. currently a Map<Language, LanguageString>. 
16
 * The implementation of the MultiLanguageString construct is about to change in 
14
 * This interface was merely created to get convenient access to all classes
15
 * that hold a MultiLanguageString, i.e. currently a Map<Language, LanguageString>.
16
 * The implementation of the MultiLanguageString construct is about to change in
17 17
 * a future version.
18
 * 
18
 *
19 19
 * @author n.hoffmann
20
<<<<<<< HEAD
20 21
 * @since Dec 2, 2010
21 22
 * @version 1.0
23
=======
24
 * @created Dec 2, 2010
25
>>>>>>> cleanup
22 26
 */
23 27
public interface IMultiLanguageTextHolder {
24 28

  
25
	
26
	
29

  
30

  
27 31
}
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java
52 52
 * according to the SDD schema.
53 53
 *
54 54
 * @author m.doering
55
 * @version 1.0
56 55
 * @since 08-Nov-2007 13:06:28
57 56
 */
58 57
@XmlAccessorType(XmlAccessType.FIELD)
......
64 63
@Entity
65 64
@Audited
66 65
@Indexed(index = "eu.etaxonomy.cdm.model.description.DescriptionElementBase")
67
public class IndividualsAssociation extends DescriptionElementBase implements IMultiLanguageTextHolder, Cloneable{
66
public class IndividualsAssociation extends DescriptionElementBase
67
        implements IMultiLanguageTextHolder, Cloneable{
68 68
	private static final long serialVersionUID = -4117554860254531809L;
69 69
	private static final Logger logger = Logger.getLogger(IndividualsAssociation.class);
70 70

  
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaRepresentationPart.java
81 81
	protected MediaRepresentationPart() {
82 82
		super();
83 83
	}
84

  
84 85
	protected MediaRepresentationPart(URI uri, Integer size) {
85 86
		this();
86 87
		this.setUri(uri);
......
105 106
	public URI getUri() {
106 107
		return this.uri;
107 108
	}
109

  
108 110
	public void setUri(URI uri) {
109 111
		this.uri = uri;
110 112
	}
......
129 131
		//no changes to: size, uri
130 132
		return result;
131 133
	}
132

  
133

  
134 134
}

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)