Revision a784f00f
Added by Katja Luther over 14 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java | ||
|---|---|---|
| 94 | 94 |
if (country != null || CdmUtils.isNotEmpty(locality) || CdmUtils.isNotEmpty(pobox) || CdmUtils.isNotEmpty(postcode) || |
| 95 | 95 |
CdmUtils.isNotEmpty(region) || CdmUtils.isNotEmpty(street) ){
|
| 96 | 96 |
Address newAddress = Address.NewInstance(country, locality, pobox, postcode, region, street, location); |
| 97 |
result.addresses.add(newAddress);
|
|
| 97 |
result.addAddress(newAddress);
|
|
| 98 | 98 |
} |
| 99 | 99 |
if (email != null){
|
| 100 |
result.emailAddresses.add(email);
|
|
| 100 |
result.addEmailAddress(email);
|
|
| 101 | 101 |
} |
| 102 | 102 |
if (faxNumber != null){
|
| 103 |
result.faxNumbers.add(faxNumber);
|
|
| 103 |
result.addFaxNumber(faxNumber);
|
|
| 104 | 104 |
} |
| 105 | 105 |
if (phoneNumber != null){
|
| 106 |
result.phoneNumbers.add(phoneNumber);
|
|
| 106 |
result.addPhoneNumber(phoneNumber);
|
|
| 107 | 107 |
} |
| 108 | 108 |
if (url != null){
|
| 109 |
result.urls.add(url);
|
|
| 109 |
result.addUrl(url);
|
|
| 110 | 110 |
} |
| 111 | 111 |
return result; |
| 112 | 112 |
} |
| ... | ... | |
| 140 | 140 |
public Contact() {
|
| 141 | 141 |
} |
| 142 | 142 |
|
| 143 |
@XmlElementWrapper(name = "EmailAddresses") |
|
| 143 |
@XmlElementWrapper(name = "EmailAddresses", nillable = true)
|
|
| 144 | 144 |
@XmlElement(name = "EmailAddress") |
| 145 | 145 |
@CollectionOfElements(fetch = FetchType.LAZY) |
| 146 |
private List<String> emailAddresses = new ArrayList<String>();
|
|
| 146 |
private List<String> emailAddresses; |
|
| 147 | 147 |
|
| 148 |
@XmlElementWrapper(name = "URLs") |
|
| 148 |
@XmlElementWrapper(name = "URLs", nillable = true)
|
|
| 149 | 149 |
@XmlElement(name = "URL") |
| 150 | 150 |
@XmlSchemaType(name = "anyURI") |
| 151 | 151 |
@CollectionOfElements(fetch = FetchType.LAZY) |
| 152 |
private List<String> urls = new ArrayList<String>();
|
|
| 152 |
private List<String> urls; |
|
| 153 | 153 |
|
| 154 |
@XmlElementWrapper(name = "PhoneNumbers") |
|
| 154 |
@XmlElementWrapper(name = "PhoneNumbers", nillable = true)
|
|
| 155 | 155 |
@XmlElement(name = "PhoneNumber") |
| 156 | 156 |
@CollectionOfElements(fetch = FetchType.LAZY) |
| 157 |
private List<String> phoneNumbers = new ArrayList<String>();
|
|
| 157 |
private List<String> phoneNumbers; |
|
| 158 | 158 |
|
| 159 |
@XmlElementWrapper(name = "FaxNumbers") |
|
| 159 |
@XmlElementWrapper(name = "FaxNumbers", nillable = true)
|
|
| 160 | 160 |
@XmlElement(name = "FaxNumber") |
| 161 | 161 |
@CollectionOfElements(fetch = FetchType.LAZY) |
| 162 |
private List<String> faxNumbers = new ArrayList<String>();
|
|
| 162 |
private List<String> faxNumbers; |
|
| 163 | 163 |
|
| 164 |
@XmlElementWrapper(name = "Addresses") |
|
| 164 |
@XmlElementWrapper(name = "Addresses", nillable = true)
|
|
| 165 | 165 |
@XmlElement(name = "Address") |
| 166 | 166 |
@OneToMany(fetch = FetchType.LAZY) |
| 167 | 167 |
@Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE, CascadeType.DELETE_ORPHAN})
|
| 168 |
protected Set<Address> addresses = new HashSet<Address>();
|
|
| 168 |
protected Set<Address> addresses; |
|
| 169 | 169 |
|
| 170 | 170 |
|
| 171 | 171 |
public void merge(Contact contact2) throws MergeException{
|
| ... | ... | |
| 202 | 202 |
* @see Address |
| 203 | 203 |
*/ |
| 204 | 204 |
public Set<Address> getAddresses(){
|
| 205 |
if(this.addresses == null) {
|
|
| 206 |
this.addresses = new HashSet<Address>(); |
|
| 207 |
} |
|
| 205 | 208 |
return this.addresses; |
| 206 | 209 |
} |
| 207 | 210 |
|
| ... | ... | |
| 214 | 217 |
*/ |
| 215 | 218 |
public void addAddress(Address address){
|
| 216 | 219 |
if (address != null){
|
| 217 |
addresses.add(address);
|
|
| 220 |
getAddresses().add(address);
|
|
| 218 | 221 |
} |
| 219 | 222 |
} |
| 220 | 223 |
|
| 221 | 224 |
public void addAddress(String street, String postcode, String locality, |
| 222 | 225 |
WaterbodyOrCountry country, String pobox, String region, Point location){
|
| 223 | 226 |
Address newAddress = Address.NewInstance(country, locality, pobox, postcode, region, street, location); |
| 224 |
addresses.add(newAddress);
|
|
| 227 |
getAddresses().add(newAddress);
|
|
| 225 | 228 |
} |
| 226 | 229 |
|
| 227 | 230 |
/** |
| ... | ... | |
| 231 | 234 |
* @see #getAddresses() |
| 232 | 235 |
*/ |
| 233 | 236 |
public void removeAddress(Address address){
|
| 234 |
addresses.remove(address);
|
|
| 237 |
getAddresses().remove(address);
|
|
| 235 | 238 |
} |
| 236 | 239 |
|
| 237 | 240 |
|
| ... | ... | |
| 240 | 243 |
* included in <i>this</i> contact. |
| 241 | 244 |
*/ |
| 242 | 245 |
public List<String> getEmailAddresses(){
|
| 246 |
if(this.emailAddresses == null) {
|
|
| 247 |
this.emailAddresses = new ArrayList<String>(); |
|
| 248 |
} |
|
| 243 | 249 |
return this.emailAddresses; |
| 244 | 250 |
} |
| 245 | 251 |
|
| ... | ... | |
| 247 | 253 |
* @see #getEmailAddress() |
| 248 | 254 |
*/ |
| 249 | 255 |
public void addEmailAddress(String emailAddress){
|
| 250 |
this.emailAddresses.add(emailAddress);
|
|
| 256 |
getEmailAddresses().add(emailAddress);
|
|
| 251 | 257 |
} |
| 252 | 258 |
|
| 253 | 259 |
/** |
| ... | ... | |
| 257 | 263 |
* @see #getEmailAddresses() |
| 258 | 264 |
*/ |
| 259 | 265 |
public void removeEmailAddress(String emailAddress){
|
| 260 |
emailAddresses.remove(emailAddress);
|
|
| 266 |
getEmailAddresses().remove(emailAddress);
|
|
| 261 | 267 |
} |
| 262 | 268 |
|
| 263 | 269 |
/** |
| ... | ... | |
| 265 | 271 |
* included in <i>this</i> contact. |
| 266 | 272 |
*/ |
| 267 | 273 |
public List<String> getUrls(){
|
| 274 |
if(this.urls == null) {
|
|
| 275 |
this.urls = new ArrayList<String>(); |
|
| 276 |
} |
|
| 268 | 277 |
return this.urls; |
| 269 | 278 |
} |
| 270 | 279 |
|
| ... | ... | |
| 272 | 281 |
* @see #getUrls() |
| 273 | 282 |
*/ |
| 274 | 283 |
public void addUrl(String url){
|
| 275 |
this.urls.add(url);
|
|
| 284 |
getUrls().add(url);
|
|
| 276 | 285 |
} |
| 277 | 286 |
|
| 278 | 287 |
/** |
| ... | ... | |
| 282 | 291 |
* @see #getUrls() |
| 283 | 292 |
*/ |
| 284 | 293 |
public void removeUrl(String url){
|
| 285 |
urls.remove(url);
|
|
| 294 |
getUrls().remove(url);
|
|
| 286 | 295 |
} |
| 287 | 296 |
|
| 288 | 297 |
/** |
| ... | ... | |
| 290 | 299 |
* included in <i>this</i> contact. |
| 291 | 300 |
*/ |
| 292 | 301 |
public List<String> getPhoneNumbers(){
|
| 302 |
if(this.phoneNumbers == null) {
|
|
| 303 |
this.phoneNumbers = new ArrayList<String>(); |
|
| 304 |
} |
|
| 293 | 305 |
return this.phoneNumbers; |
| 294 | 306 |
} |
| 295 | 307 |
|
| ... | ... | |
| 297 | 309 |
* @see #getPhone() |
| 298 | 310 |
*/ |
| 299 | 311 |
public void addPhoneNumber(String phoneNumber){
|
| 300 |
this.phoneNumbers.add(phoneNumber);
|
|
| 312 |
getPhoneNumbers().add(phoneNumber);
|
|
| 301 | 313 |
} |
| 302 | 314 |
|
| 303 | 315 |
/** |
| ... | ... | |
| 307 | 319 |
* @see #getPhoneNumber() |
| 308 | 320 |
*/ |
| 309 | 321 |
public void removePhoneNumber(String phoneNumber){
|
| 310 |
phoneNumbers.remove(phoneNumber);
|
|
| 322 |
getPhoneNumbers().remove(phoneNumber);
|
|
| 311 | 323 |
} |
| 312 | 324 |
|
| 313 | 325 |
/** |
| ... | ... | |
| 315 | 327 |
* included in <i>this</i> contact. |
| 316 | 328 |
*/ |
| 317 | 329 |
public List<String> getFaxNumbers(){
|
| 330 |
if(this.faxNumbers == null) {
|
|
| 331 |
this.faxNumbers = new ArrayList<String>(); |
|
| 332 |
} |
|
| 318 | 333 |
return this.faxNumbers; |
| 319 | 334 |
} |
| 320 | 335 |
|
| ... | ... | |
| 322 | 337 |
* @see #getFaxNumbers() |
| 323 | 338 |
*/ |
| 324 | 339 |
public void addFaxNumber(String faxNumber){
|
| 325 |
this.faxNumbers.add(faxNumber);
|
|
| 340 |
getFaxNumbers().add(faxNumber);
|
|
| 326 | 341 |
} |
| 327 | 342 |
|
| 328 | 343 |
/** |
| ... | ... | |
| 332 | 347 |
* @see #getFaxNumber() |
| 333 | 348 |
*/ |
| 334 | 349 |
public void removeFaxNumber(String faxNumber){
|
| 335 |
faxNumbers.remove(faxNumber);
|
|
| 350 |
getFaxNumbers().remove(faxNumber);
|
|
| 336 | 351 |
} |
| 337 | 352 |
|
| 338 | 353 |
|
Also available in: Unified diff
merge cate-development2 branch with trunk