Revision 9c021029
Added by Andreas Müller over 1 year ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/OriginalSourceBase.java | ||
|---|---|---|
| 62 | 62 |
"type", |
| 63 | 63 |
"idInSource", |
| 64 | 64 |
"idNamespace", |
| 65 |
"originalNameString", |
|
| 66 | 65 |
"citation", |
| 67 | 66 |
"citationMicroReference", |
| 67 |
"originalInfo", |
|
| 68 | 68 |
"cdmSource", |
| 69 | 69 |
"links" |
| 70 | 70 |
}) |
| ... | ... | |
| 114 | 114 |
@XmlElement(name = "CitationMicroReference") |
| 115 | 115 |
private String citationMicroReference; |
| 116 | 116 |
|
| 117 |
@XmlElement(name = "OriginalNameString")
|
|
| 118 |
private String originalNameString;
|
|
| 117 |
@XmlElement(name = "OriginalInfo")
|
|
| 118 |
private String originalInfo;
|
|
| 119 | 119 |
|
| 120 | 120 |
@XmlElement(name = "CdmSource") |
| 121 | 121 |
@XmlIDREF |
| ... | ... | |
| 192 | 192 |
this.citationMicroReference = citationMicroReference; |
| 193 | 193 |
} |
| 194 | 194 |
|
| 195 |
public String getOriginalNameString(){
|
|
| 196 |
return this.originalNameString;
|
|
| 195 |
public String getOriginalInfo(){
|
|
| 196 |
return this.originalInfo;
|
|
| 197 | 197 |
} |
| 198 |
public void setOriginalNameString(String originalNameString){
|
|
| 199 |
this.originalNameString = originalNameString;
|
|
| 198 |
public void setOriginalInfo(String originalInfo){
|
|
| 199 |
this.originalInfo = originalInfo;
|
|
| 200 | 200 |
} |
| 201 | 201 |
|
| 202 | 202 |
@Override |
| ... | ... | |
| 268 | 268 |
} |
| 269 | 269 |
|
| 270 | 270 |
//no changes to: type, idInSource, idNamespace, |
| 271 |
// citation, citationMicroReference, originalNameString
|
|
| 271 |
// citation, citationMicroReference, originalInfo
|
|
| 272 | 272 |
return result; |
| 273 | 273 |
} |
| 274 | 274 |
|
| ... | ... | |
| 293 | 293 |
&& (excludeType || this.type == null) |
| 294 | 294 |
&& this.getCitation() == null |
| 295 | 295 |
&& isBlank(this.getCitationMicroReference()) |
| 296 |
&& isBlank(this.getOriginalNameString())
|
|
| 296 |
&& isBlank(this.getOriginalInfo())
|
|
| 297 | 297 |
&& isBlank(this.getIdInSource()) |
| 298 | 298 |
&& isBlank(this.getIdNamespace()) |
| 299 | 299 |
&& this.links.isEmpty() |
| ... | ... | |
| 332 | 332 |
|
| 333 | 333 |
if(thisCitationId != otherCitationId |
| 334 | 334 |
|| !StringUtils.equals(this.getCitationMicroReference(), other.getCitationMicroReference()) |
| 335 |
|| !StringUtils.equals(this.getOriginalNameString(), other.getOriginalNameString())
|
|
| 335 |
|| !StringUtils.equals(this.getOriginalInfo(), other.getOriginalInfo())
|
|
| 336 | 336 |
){
|
| 337 | 337 |
return false; |
| 338 | 338 |
} |
Also available in: Unified diff
ref #10097 change originalNameString to originalInfo in cdmlib