Project

General

Profile

« Previous | Next » 

Revision e6d7b501

Added by Andreas Müller almost 7 years ago

ref #6368 remove TaxonNameBase subclasses

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/caryophyllales/out/CsvNameExport.java
33 33
import eu.etaxonomy.cdm.model.description.Feature;
34 34
import eu.etaxonomy.cdm.model.description.TextData;
35 35
import eu.etaxonomy.cdm.model.location.NamedArea;
36
import eu.etaxonomy.cdm.model.name.BotanicalName;
37 36
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
38 37
import eu.etaxonomy.cdm.model.name.HomotypicalGroupComparator;
39 38
import eu.etaxonomy.cdm.model.name.IBotanicalName;
......
258 257
        boolean isInvalidRel = false;
259 258
        for (NameRelationship nameRel: nameRelations){
260 259
           // NameRelationship nameRel = nameRelations.iterator().next();
261
            BotanicalName fromName = HibernateProxyHelper.deproxy(nameRel.getFromName(), BotanicalName.class);
260
            IBotanicalName fromName = HibernateProxyHelper.deproxy(nameRel.getFromName(), IBotanicalName.class);
262 261

  
263 262
            nameRel = HibernateProxyHelper.deproxy(nameRel, NameRelationship.class);
264 263
            nameRelType = nameRel.getType().getTitleCache();
......
499 498
        TaxonNode familyNode = getHigherNode(childNode, Rank.FAMILY());
500 499
        Taxon taxon;
501 500
        String nameString;
502
        BotanicalName name;
501
        IBotanicalName name;
503 502
        if (familyNode == null){
504 503
            nameRecord.put("familyTaxon", null);
505 504
            nameRecord.put("familyName", null);
......
514 513
            //if publish flag is set
515 514

  
516 515
            //  if (taxon.isPublish()){
517
            name = HibernateProxyHelper.deproxy(taxon.getName(), BotanicalName.class);
516
            name = HibernateProxyHelper.deproxy(taxon.getName(), IBotanicalName.class);
518 517
            nameRecord.put("familyName", name.getNameCache());
519 518
            extractDescriptions(nameRecord, taxon, Feature.INTRODUCTION(), "descriptionsFam", state);
520 519
        }
......
529 528
            //if publish flag is set
530 529

  
531 530
            //  if (taxon.isPublish()){
532
            name = HibernateProxyHelper.deproxy(taxon.getName(), BotanicalName.class);
531
            name = HibernateProxyHelper.deproxy(taxon.getName(), IBotanicalName.class);
533 532
            if (name.getNameCache() != null){
534 533
                nameRecord.put("genusName", name.getNameCache());
535 534
            }else{
......
558 557

  
559 558
        getTaxonRelations(nameRecord, taxon);
560 559

  
561
        name = HibernateProxyHelper.deproxy(getNameService().load(taxon.getName().getUuid()), BotanicalName.class);
560
        name = HibernateProxyHelper.deproxy(getNameService().load(taxon.getName().getUuid()), IBotanicalName.class);
562 561
        nameRecord.put("childName",nameString);
563 562
        nameRecord.put("nameId", String.valueOf(name.getId()));
564 563
        nameRecord.put("nameCache", name.getNameCache());
......
581 580
            if (typeDes instanceof NameTypeDesignation){
582 581
                NameTypeDesignation nameTypeDes = HibernateProxyHelper.deproxy(typeDes, NameTypeDesignation.class);
583 582

  
584
                BotanicalName typeName =  HibernateProxyHelper.deproxy(nameTypeDes.getTypeName(), BotanicalName.class);
583
                IBotanicalName typeName =  HibernateProxyHelper.deproxy(nameTypeDes.getTypeName(), IBotanicalName.class);
585 584
                if (typeName != null){
586 585

  
587 586
                    typeNameString = "<i>" + typeName.getNameCache() +"</i> "  + typeName.getAuthorshipCache();
......
601 600
        List<Synonym> homotypicSynonyms;
602 601

  
603 602
        HomotypicalGroup group;
604
        BotanicalName synonymName;
603
        IBotanicalName synonymName;
605 604
        String doubtfulTitleCache;
606 605
        for (Synonym synonym: taxon.getSynonyms()){
607
            synonymName = HibernateProxyHelper.deproxy(synonym.getName(), BotanicalName.class);
606
            synonymName = HibernateProxyHelper.deproxy(synonym.getName(), IBotanicalName.class);
608 607
            group = HibernateProxyHelper.deproxy(synonymName.getHomotypicalGroup(), HomotypicalGroup.class);
609 608
            synonymName.generateFullTitle();
610 609
            if (synonym.isDoubtful()){
611 610
                if (!synonymName.getFullTitleCache().startsWith("?")){
612 611
                    doubtfulTitleCache = "?" + synonymName.getFullTitleCache();
613
                    synonymName = (BotanicalName) synonymName.clone();
612
                    synonymName = (IBotanicalName) synonymName.clone();
614 613
                    synonymName.setFullTitleCache(doubtfulTitleCache, true);
615 614
                }
616 615
            }
......
643 642
                    status = HibernateProxyHelper.deproxy(synonym.getName().getStatus().iterator().next(),NomenclaturalStatus.class);
644 643
                    if (status.getType().isInvalidType()){
645 644
                        heterotypicalSynonyms.append(" <invalid> ");
646
                        synonymName = HibernateProxyHelper.deproxy(synonym.getName(), BotanicalName.class);
645
                        synonymName = HibernateProxyHelper.deproxy(synonym.getName(), IBotanicalName.class);
647 646

  
648 647
                        synonymString = createSynonymNameString(synonymName, state.getConfig().isInvalidNamesQuoted()) ;
649 648
                        heterotypicalSynonyms.append(synonymString);
......
656 655
                    heterotypicalSynonyms.append(" <homonym> ");
657 656
                }
658 657
                first = false;
659
                synonymName = HibernateProxyHelper.deproxy(synonym.getName(), BotanicalName.class);
658
                synonymName = HibernateProxyHelper.deproxy(synonym.getName(), IBotanicalName.class);
660 659
                synonymString = createSynonymNameString(synonymName, false);
661 660
                heterotypicalSynonyms.append(synonymString);
662 661
            }
......
671 670
                status = HibernateProxyHelper.deproxy(synonym.getName().getStatus().iterator().next(),NomenclaturalStatus.class);
672 671
                if (status.getType().isInvalidType()){
673 672
                    homotypicalSynonyms.append(" <invalid> ");
674
                    synonymName = HibernateProxyHelper.deproxy(synonym.getName(), BotanicalName.class);
673
                    synonymName = HibernateProxyHelper.deproxy(synonym.getName(), IBotanicalName.class);
675 674
                    synonymString = createSynonymNameString(synonymName, true);
676 675
                    homotypicalSynonyms.append(synonymString);
677 676
                    continue;
......
683 682
                homotypicalSynonyms.append(" <homonym> ");
684 683
            }
685 684
            first = false;
686
            synonymName = HibernateProxyHelper.deproxy(synonym.getName(), BotanicalName.class);
685
            synonymName = HibernateProxyHelper.deproxy(synonym.getName(), IBotanicalName.class);
687 686

  
688 687
            synonymString = createSynonymNameString(synonymName, false);
689 688

  
......
702 701
        String relNameString = null;
703 702
        if (nameRelations.size()>0){
704 703
            NameRelationship nameRel = nameRelations.iterator().next();
705
            BotanicalName fromName = HibernateProxyHelper.deproxy(nameRel.getFromName(), BotanicalName.class);
704
            IBotanicalName fromName = HibernateProxyHelper.deproxy(nameRel.getFromName(), IBotanicalName.class);
706 705
            if (fromName.equals(taxon.getName())){
707 706
                relatedName = nameRel.getToName();
708 707

  

Also available in: Unified diff