Project

General

Profile

« Previous | Next » 

Revision 9c021029

Added by Andreas Müller over 1 year ago

ref #10097 change originalNameString to originalInfo in cdmlib

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
2039 2039

  
2040 2040
    @Override
2041 2041
    @Transient
2042
    public void setOriginalNameString(String originalNameString){
2043
        if (isNotBlank(originalNameString)){
2044
            this.getNomenclaturalSource(true).setOriginalNameString(originalNameString);
2042
    public void setOriginalInfo(String originalInfo){
2043
        if (isNotBlank(originalInfo)){
2044
            this.getNomenclaturalSource(true).setOriginalInfo(originalInfo);
2045 2045
        }else if (this.getNomenclaturalSource() != null){
2046
            this.getNomenclaturalSource().setOriginalNameString(null);
2046
            this.getNomenclaturalSource().setOriginalInfo(null);
2047 2047
            checkNullSource();
2048 2048
        }
2049 2049
    }
......
2443 2443
     * @param  typeSpecies				the taxon name to be used as type of <i>this</i> taxon name
2444 2444
     * @param  citation					the reference for this new designation
2445 2445
     * @param  citationMicroReference	the string with the details (generally pages) within the reference
2446
     * @param  originalNameString		the taxon name string used in the reference to assert this designation
2446
     * @param  originalInfo     		any information from the original source, might be the name as written in the source (#10097)
2447 2447
     * @param  isRejectedType			the boolean status for a rejected name type designation
2448 2448
     * @param  isConservedType			the boolean status for a conserved name type designation
2449 2449
     * @param  isLectoType				the boolean status for a lectotype name type designation
......
2459 2459
    public NameTypeDesignation addNameTypeDesignation(TaxonName typeSpecies,
2460 2460
                Reference citation,
2461 2461
                String citationMicroReference,
2462
                String originalNameString,
2462
                String originalName,
2463 2463
                NameTypeDesignationStatus status,
2464 2464
                boolean isRejectedType,
2465 2465
                boolean isConservedType,
2466 2466
                /*boolean isLectoType, */
2467 2467
                boolean isNotDesignated,
2468 2468
                boolean addToAllHomotypicNames) {
2469
        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, citation, citationMicroReference, originalNameString, status, isRejectedType, isConservedType, isNotDesignated);
2469
        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, citation, citationMicroReference, originalName, status, isRejectedType, isConservedType, isNotDesignated);
2470 2470
        //nameTypeDesignation.setLectoType(isLectoType);
2471 2471
        addTypeDesignation(nameTypeDesignation, addToAllHomotypicNames);
2472 2472
        return nameTypeDesignation;
......
2479 2479
     * @param  typeSpecies				the taxon name to be used as type of <i>this</i> taxon name
2480 2480
     * @param  citation					the reference for this new designation
2481 2481
     * @param  citationMicroReference	the string with the details (generally pages) within the reference
2482
     * @param  originalNameString		the taxon name string used in the reference to assert this designation
2482
     * @param  originalInfo     		any information from the original source, might be the name as written in the source (#10097)
2483 2483
     * @param  status                   the name type designation status
2484 2484
     * @param  addToAllHomotypicNames	the boolean indicating whether the name type designation should be
2485 2485
     * 									added to all taxon names of the homotypical group this taxon name belongs to
......
2492 2492
    public NameTypeDesignation addNameTypeDesignation(TaxonName typeSpecies,
2493 2493
                Reference citation,
2494 2494
                String citationMicroReference,
2495
                String originalNameString,
2495
                String originalInfo,
2496 2496
                NameTypeDesignationStatus status,
2497 2497
                boolean addToAllHomotypicNames) {
2498
        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, status, citation, citationMicroReference, originalNameString);
2498
        NameTypeDesignation nameTypeDesignation = new NameTypeDesignation(typeSpecies, status, citation, citationMicroReference, originalInfo);
2499 2499
        addTypeDesignation(nameTypeDesignation, addToAllHomotypicNames);
2500 2500
        return nameTypeDesignation;
2501 2501
    }
......
2527 2527
     * @param  status					the specimen type designation status
2528 2528
     * @param  citation					the reference for this new specimen type designation
2529 2529
     * @param  citationMicroReference	the string with the details (generally pages) within the reference
2530
     * @param  originalNameString		the taxon name used in the reference to assert this designation
2530
     * @param  originalInfo     		any information from the original source, might be the name as written in the source (#10097)
2531 2531
     * @param  isNotDesignated			the boolean status for a specimen type designation without specimen type
2532 2532
     * @param  addToAllHomotypicNames	the boolean indicating whether the specimen type designation should be
2533 2533
     * 									added to all taxon names of the homotypical group the typified
......
2543 2543
                SpecimenTypeDesignationStatus status,
2544 2544
                Reference citation,
2545 2545
                String citationMicroReference,
2546
                String originalNameString,
2546
                String originalInfo,
2547 2547
                boolean isNotDesignated,
2548 2548
                boolean addToAllHomotypicNames) {
2549
        SpecimenTypeDesignation specimenTypeDesignation = new SpecimenTypeDesignation(typeSpecimen, status, citation, citationMicroReference, originalNameString, isNotDesignated);
2549
        SpecimenTypeDesignation specimenTypeDesignation = new SpecimenTypeDesignation(typeSpecimen, status, citation, citationMicroReference, originalInfo, isNotDesignated);
2550 2550
        addTypeDesignation(specimenTypeDesignation, addToAllHomotypicNames);
2551 2551
        return specimenTypeDesignation;
2552 2552
    }
......
2558 2558
                boolean isVerbatim,
2559 2559
                Reference citation,
2560 2560
                String citationMicroReference,
2561
                String originalNameString,
2561
                String originalInfo,
2562 2562
                boolean addToAllHomotypicNames) {
2563
        TextualTypeDesignation textualTypeDesignation = TextualTypeDesignation.NewInstance(text, language, isVerbatim, citation, citationMicroReference, originalNameString);
2563
        TextualTypeDesignation textualTypeDesignation = TextualTypeDesignation.NewInstance(text, language, isVerbatim, citation, citationMicroReference, originalInfo);
2564 2564
        addTypeDesignation(textualTypeDesignation, addToAllHomotypicNames);
2565 2565
        return textualTypeDesignation;
2566 2566
    }

Also available in: Unified diff