Revision b09f8d3c
Added by Andreas Müller about 5 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Character.java | ||
---|---|---|
23 | 23 |
import org.hibernate.envers.Audited; |
24 | 24 |
import org.hibernate.search.annotations.IndexedEmbedded; |
25 | 25 |
|
26 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
|
26 | 27 |
import eu.etaxonomy.cdm.model.common.Language; |
27 | 28 |
|
28 | 29 |
/** |
... | ... | |
37 | 38 |
@XmlAccessorType(XmlAccessType.PROPERTY) |
38 | 39 |
@XmlType(name="Feature", factoryMethod="NewInstance", propOrder = { |
39 | 40 |
"structure", |
40 |
"property" |
|
41 |
"structureModifier", |
|
42 |
"property", |
|
43 |
"propertyModifier" |
|
41 | 44 |
}) |
42 |
@XmlRootElement(name = "Feature")
|
|
45 |
@XmlRootElement(name = "Character")
|
|
43 | 46 |
@Entity |
44 | 47 |
@Audited |
45 | 48 |
public class Character extends Feature { |
... | ... | |
48 | 51 |
@SuppressWarnings("unused") |
49 | 52 |
private static final Logger logger = Logger.getLogger(Feature.class); |
50 | 53 |
|
51 |
|
|
52 | 54 |
@XmlElement(name = "Structure") |
53 | 55 |
@XmlIDREF |
54 | 56 |
@XmlSchemaType(name = "IDREF") |
... | ... | |
57 | 59 |
// @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE}) |
58 | 60 |
private FeatureNode structure; |
59 | 61 |
|
62 |
//#8120 |
|
63 |
@XmlElement(name = "StructureModifier") |
|
64 |
@XmlIDREF |
|
65 |
@XmlSchemaType(name = "IDREF") |
|
66 |
@ManyToOne(fetch = FetchType.LAZY) |
|
67 |
@IndexedEmbedded |
|
68 |
private DefinedTerm structureModifier; |
|
69 |
|
|
60 | 70 |
@XmlElement(name = "Property") |
61 | 71 |
@XmlIDREF |
62 | 72 |
@XmlSchemaType(name = "IDREF") |
... | ... | |
65 | 75 |
// @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE}) |
66 | 76 |
private FeatureNode property; |
67 | 77 |
|
78 |
//#8120 |
|
79 |
/** |
|
80 |
* @deprecated experimental, may be removed in future |
|
81 |
*/ |
|
82 |
@Deprecated |
|
83 |
@XmlElement(name = "PropertyModifier") |
|
84 |
@XmlIDREF |
|
85 |
@XmlSchemaType(name = "IDREF") |
|
86 |
@ManyToOne(fetch = FetchType.LAZY) |
|
87 |
@IndexedEmbedded |
|
88 |
private DefinedTerm propertyModifier; |
|
89 |
|
|
68 | 90 |
/* ***************** CONSTRUCTOR AND FACTORY METHODS **********************************/ |
69 | 91 |
|
70 | 92 |
|
93 |
|
|
94 |
|
|
71 | 95 |
public static Character NewInstance() { |
72 | 96 |
return new Character(); |
73 | 97 |
} |
... | ... | |
145 | 169 |
public FeatureNode getStructure() { |
146 | 170 |
return structure; |
147 | 171 |
} |
172 |
public void setStructure(FeatureNode structure) { |
|
173 |
this.structure = structure; |
|
174 |
} |
|
148 | 175 |
|
149 | 176 |
public FeatureNode getProperty() { |
150 | 177 |
return property; |
151 | 178 |
} |
179 |
public void setProperty(FeatureNode property) { |
|
180 |
this.property = property; |
|
181 |
} |
|
182 |
|
|
183 |
public DefinedTerm getStructureModifier() { |
|
184 |
return structureModifier; |
|
185 |
} |
|
186 |
public void setStructureModifier(DefinedTerm structureModifier) { |
|
187 |
this.structureModifier = structureModifier; |
|
188 |
} |
|
189 |
|
|
190 |
/** |
|
191 |
* @return |
|
192 |
* @deprecated experimental, may be removed in future |
|
193 |
*/ |
|
194 |
@Deprecated |
|
195 |
public DefinedTerm getPropertyModifier() { |
|
196 |
return propertyModifier; |
|
197 |
} |
|
198 |
/** |
|
199 |
* @param propertyModifier |
|
200 |
* @deprecated experimental, may be removed in future |
|
201 |
*/ |
|
202 |
@Deprecated |
|
203 |
public void setPropertyModifier(DefinedTerm propertyModifier) { |
|
204 |
this.propertyModifier = propertyModifier; |
|
205 |
} |
|
206 |
|
|
152 | 207 |
} |
Also available in: Unified diff
ref #8120 Add structuralModifier and propertyModifier to Character