Revision 9dc896c9
Added by Andreas Müller almost 7 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IntextReference.java | ||
|---|---|---|
| 20 | 20 |
|
| 21 | 21 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.media.Media; |
| 23 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 23 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
|
| 24 | 24 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
| ... | ... | |
| 61 | 61 |
@XmlIDREF |
| 62 | 62 |
@XmlSchemaType(name = "IDREF") |
| 63 | 63 |
@ManyToOne(fetch = FetchType.LAZY) |
| 64 |
private TaxonNameBase<?,?> taxonName;
|
|
| 64 |
private TaxonName taxonName; |
|
| 65 | 65 |
|
| 66 | 66 |
@XmlElement(name = "Taxon") |
| 67 | 67 |
@XmlIDREF |
| ... | ... | |
| 142 | 142 |
return result; |
| 143 | 143 |
} |
| 144 | 144 |
|
| 145 |
// public static IntextReference NewTaxonNameInstance(TaxonNameBase<?,?> taxonName, LanguageStringBase languageString, int start, int end){
|
|
| 145 |
// public static IntextReference NewTaxonNameInstance(TaxonName taxonName, LanguageStringBase languageString, int start, int end){
|
|
| 146 | 146 |
// return new IntextReference(taxonName, null, null, null, null, null, languageString, start, end); |
| 147 | 147 |
// } |
| 148 | 148 |
// |
| ... | ... | |
| 195 | 195 |
@Deprecated //for hibernate use only |
| 196 | 196 |
private IntextReference(){}
|
| 197 | 197 |
|
| 198 |
// private IntextReference(TaxonNameBase<?, ?> taxonName, TaxonBase<?> taxon,
|
|
| 198 |
// private IntextReference(TaxonName taxonName, TaxonBase<?> taxon, |
|
| 199 | 199 |
// SpecimenOrObservationBase<?> occurrence, AgentBase<?> agent, |
| 200 | 200 |
// Reference reference, Media media, LanguageStringBase languageString, int start, int end) {
|
| 201 | 201 |
// super(); |
| ... | ... | |
| 275 | 275 |
*/ |
| 276 | 276 |
private void setTarget(IIntextReferenceTarget target) {
|
| 277 | 277 |
target = CdmBase.deproxy(target); |
| 278 |
if (target instanceof TaxonNameBase){
|
|
| 279 |
this.taxonName = (TaxonNameBase<?,?>)target;
|
|
| 278 |
if (target instanceof TaxonName){
|
|
| 279 |
this.taxonName = (TaxonName<?,?>)target; |
|
| 280 | 280 |
}else if (target instanceof TaxonBase){
|
| 281 | 281 |
this.taxon = (TaxonBase<?>)target; |
| 282 | 282 |
}else if (target instanceof SpecimenOrObservationBase){
|
| ... | ... | |
| 328 | 328 |
} |
| 329 | 329 |
} |
| 330 | 330 |
|
| 331 |
// public TaxonNameBase<?, ?> getTaxonName() {
|
|
| 331 |
// public TaxonName getTaxonName() {
|
|
| 332 | 332 |
// return taxonName; |
| 333 | 333 |
// } |
| 334 |
// public void setTaxonName(TaxonNameBase<?, ?> taxonName) {
|
|
| 334 |
// public void setTaxonName(TaxonName taxonName) {
|
|
| 335 | 335 |
// this.taxonName = taxonName; |
| 336 | 336 |
// } |
| 337 | 337 |
// |
Also available in: Unified diff
fix #6368 rename table and class TaxonNameBase