Project

General

Profile

« Previous | Next » 

Revision f33355c3

Added by Andreas Müller over 3 years ago

ref #9204 remove commons-lang2 from cdmlib dependencies

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java
28 28
import javax.xml.bind.annotation.XmlSchemaType;
29 29
import javax.xml.bind.annotation.XmlType;
30 30

  
31
import org.apache.commons.lang.StringUtils;
32 31
import org.apache.log4j.Logger;
33 32
import org.hibernate.annotations.Cascade;
34 33
import org.hibernate.annotations.CascadeType;
......
304 303
	}
305 304

  
306 305
	public void setCatalogNumber(String catalogNumber) {
307
		this.catalogNumber = StringUtils.isBlank(catalogNumber)?null:catalogNumber;
306
		this.catalogNumber = isBlank(catalogNumber)?null:catalogNumber;
308 307
	}
309 308

  
310 309
	public void setBarcode(String barcode) {
311
		this.barcode = StringUtils.isBlank(barcode)? null : barcode;
310
		this.barcode = isBlank(barcode)? null : barcode;
312 311
	}
313 312
	public String getBarcode() {
314 313
		return barcode;
......
321 320
	public String getAccessionNumber() {
322 321
		return accessionNumber;
323 322
	}
324

  
325

  
326 323
	public void setAccessionNumber(String accessionNumber) {
327
		this.accessionNumber = StringUtils.isBlank(accessionNumber)? null : accessionNumber;
324
		this.accessionNumber = isBlank(accessionNumber)? null : accessionNumber;
328 325
	}
329 326

  
330

  
331 327
	/**
332 328
	 * Original label information may present the exact original text
333 329
	 * or any other text which fully or partly represents the text available
......
363 359
	 */
364 360
	@Deprecated
365 361
	public void setCollectorsNumber(String collectorsNumber) {
366
		this.collectorsNumber = StringUtils.isBlank(collectorsNumber)? null : collectorsNumber;
362
		this.collectorsNumber = isBlank(collectorsNumber)? null : collectorsNumber;
367 363
	}
368 364

  
369 365
	public TaxonName getStoredUnder() {
......
392 388
	}
393 389

  
394 390
    public String getMostSignificantIdentifier() {
395
        if (StringUtils.isNotBlank(getAccessionNumber())) {
391
        if (isNotBlank(getAccessionNumber())) {
396 392
            return getAccessionNumber();
397 393
        }
398
        else if(StringUtils.isNotBlank(getBarcode())){
394
        else if(isNotBlank(getBarcode())){
399 395
            return getBarcode();
400 396
        }
401
        else if(StringUtils.isNotBlank(getCatalogNumber())){
397
        else if(isNotBlank(getCatalogNumber())){
402 398
            return getCatalogNumber();
403 399
        }
404 400
        return null;
......
420 416

  
421 417

  
422 418
	public void setExsiccatum(String exsiccatum) {
423
		this.exsiccatum = StringUtils.isBlank(exsiccatum)? null : exsiccatum;
419
		this.exsiccatum = isBlank(exsiccatum)? null : exsiccatum;
424 420
	}
425 421

  
426 422
	public String getExsiccatum() {

Also available in: Unified diff