Revision 9dc896c9
Added by Andreas Müller almost 7 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DeterminationEvent.java | ||
|---|---|---|
| 38 | 38 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 39 | 39 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
| 40 | 40 |
import eu.etaxonomy.cdm.model.common.EventBase; |
| 41 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 41 |
import eu.etaxonomy.cdm.model.name.TaxonName; |
|
| 42 | 42 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 43 | 43 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 44 | 44 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
| ... | ... | |
| 89 | 89 |
@ManyToOne(fetch = FetchType.LAZY) |
| 90 | 90 |
@IndexedEmbedded(includeEmbeddedObjectId=true) |
| 91 | 91 |
@Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
|
| 92 |
private TaxonNameBase<?,?> taxonName;
|
|
| 92 |
private TaxonName<?,?> taxonName; |
|
| 93 | 93 |
|
| 94 | 94 |
@XmlElement(name = "Modifier") |
| 95 | 95 |
@XmlIDREF |
| ... | ... | |
| 130 | 130 |
return result; |
| 131 | 131 |
} |
| 132 | 132 |
|
| 133 |
public static DeterminationEvent NewInstance(TaxonNameBase name, SpecimenOrObservationBase identifiedUnit ){
|
|
| 133 |
public static DeterminationEvent NewInstance(TaxonName name, SpecimenOrObservationBase identifiedUnit ){
|
|
| 134 | 134 |
DeterminationEvent result = new DeterminationEvent(); |
| 135 | 135 |
result.setTaxonName(name); |
| 136 | 136 |
result.setIdentifiedUnit(identifiedUnit); |
| ... | ... | |
| 158 | 158 |
} |
| 159 | 159 |
|
| 160 | 160 |
/*** @param taxon the */ |
| 161 |
public void setTaxonName(TaxonNameBase taxonName){
|
|
| 161 |
public void setTaxonName(TaxonName taxonName){
|
|
| 162 | 162 |
this.taxonName = taxonName; |
| 163 | 163 |
} |
| 164 | 164 |
|
| 165 |
public TaxonNameBase getTaxonName(){
|
|
| 165 |
public TaxonName getTaxonName(){
|
|
| 166 | 166 |
return this.taxonName; |
| 167 | 167 |
} |
| 168 | 168 |
|
Also available in: Unified diff
fix #6368 rename table and class TaxonNameBase