Project

General

Profile

Revision b417d8fa

IDb417d8fac1bcb7392927a12dec04ffa3bc9c9ed3
Parent 7264ff5f
Child 0dcc3ab8

Added by Katja Luther 2 months ago

ref #6581: activate nomenclatural source

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
2225 2225
//*************** nom ref/source *******************/
2226 2226

  
2227 2227
    @Override
2228
    @Transient
2228 2229
    public Reference getNomenclaturalReference(){
2229 2230
        //#6581
2230
        return this.nomenclaturalReference;
2231
//        if (this.nomenclaturalSource == null){
2232
//            return null;
2233
//        }
2234
//        return this.nomenclaturalSource.getCitation();
2231
        if (this.nomenclaturalSource == null){
2232
            return null;
2233
        }
2234
        return this.nomenclaturalSource.getCitation();
2235 2235
    }
2236 2236

  
2237 2237
    @Override
......
2261 2261
     */
2262 2262

  
2263 2263
    @Override
2264
    @Transient
2264 2265
    public void setNomenclaturalReference(Reference nomenclaturalReference){
2265 2266
        //#6581
2266
        this.nomenclaturalReference = nomenclaturalReference;
2267
//        getNomenclaturalSource(true).setCitation(nomenclaturalReference);
2268
//        checkNullSource();
2267
        getNomenclaturalSource(true).setCitation(nomenclaturalReference);
2268
        checkNullSource();
2269 2269
    }
2270 2270

  
2271 2271
    @Override
......
2283 2283
     */
2284 2284
    //Details of the nomenclatural reference (protologue).
2285 2285
    @Override
2286
    @Transient
2286 2287
    public String getNomenclaturalMicroReference(){
2287 2288
        //#6581
2288
        return this.nomenclaturalMicroReference;
2289
//        if (this.nomenclaturalSource == null){
2290
//            return null;
2291
//        }
2292
//        return this.nomenclaturalSource.getCitationMicroReference();
2289
        if (this.nomenclaturalSource == null){
2290
            return null;
2291
        }
2292
        return this.nomenclaturalSource.getCitationMicroReference();
2293 2293
    }
2294 2294
    /**
2295 2295
     * @see  #getNomenclaturalMicroReference()
......
2297 2297
    @Override
2298 2298
    public void setNomenclaturalMicroReference(String nomenclaturalMicroReference){
2299 2299
        //#6581
2300
        this.nomenclaturalMicroReference = nomenclaturalMicroReference;
2301
//        this.getNomenclaturalSource(true).setCitationMicroReference(isBlank(nomenclaturalMicroReference)? null : nomenclaturalMicroReference);
2302
//        checkNullSource();
2300
        this.getNomenclaturalSource(true).setCitationMicroReference(isBlank(nomenclaturalMicroReference)? null : nomenclaturalMicroReference);
2301
        checkNullSource();
2303 2302
    }
2304 2303

  
2305 2304
    //#6581

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)