Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.java
40 40 
import eu.etaxonomy.cdm.model.location.NamedArea;
41 41 
import eu.etaxonomy.cdm.model.name.IBotanicalName;
42 42 
import eu.etaxonomy.cdm.model.name.Rank;
43 
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
43 
import eu.etaxonomy.cdm.model.name.TaxonName;
44 44 
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
45 45 
import eu.etaxonomy.cdm.model.reference.Reference;
46 46 
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
......
653 653 
        if (logger.isDebugEnabled()) {
654 654 
            for (int i = 0; i < list.size(); i++) {
655 655 
                String nameCache = "";
656 
                if (list.get(i) instanceof TaxonNameBase) {
657 
                    nameCache = ((TaxonNameBase)list.get(i)).getNameCache();
656 
                if (list.get(i) instanceof TaxonName) {
657 
                    nameCache = ((TaxonName)list.get(i)).getNameCache();
658 658 
                } else if (list.get(i) instanceof TaxonBase) {
659 
                    TaxonNameBase<?,?> taxonNameBase = ((TaxonBase) list.get(i)).getName();
660 
                    nameCache = taxonNameBase.getNameCache();
659 
                    TaxonName taxonName = ((TaxonBase) list.get(i)).getName();
660 
                    nameCache = taxonName.getNameCache();
661 661 
                } else {
662 662 
                }
663 663 
                logger.log(level, list.get(i).getClass() + "(" + i + ")" + ": Name Cache = " + nameCache + ", Title Cache = "
......
746 746 
        //
747 747 
        // 2 Names without taxa
748 748 
        //
749 
        TaxonNameBase n_abies_borisiiregis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
749 
        TaxonName n_abies_borisiiregis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
750 750 
        n_abies_borisiiregis.setNameCache("Abies borisii-regis", true);
751 751 
        nameService.save(n_abies_borisiiregis);
752 752 

  		




  753
  
  
    
        TaxonNameBase n_abies_lasio = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());


  		




  
  753
  
    
        TaxonName n_abies_lasio = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());


  		




  754
  754
  
    
        n_abies_lasio.setNameCache("Abies lasio", true);


  		




  755
  755
  
    
        nameService.save(n_abies_lasio);


  		




  756
  756
  
    

  		




  ......




  823
  823
  
    

  		




  824
  824
  
    

  		




  825
  825
  
    
        writeDbUnitDataSetFile(new String[] {


  		




  826
  
  
    
            "TAXONBASE", "TAXONNAMEBASE",


  		




  
  826
  
    
            "TAXONBASE", "TAXONNAME",


  		




  827
  827
  
    
            "TAXONRELATIONSHIP",


  		




  828
  828
  
    
            "REFERENCE", "DESCRIPTIONELEMENTBASE", "DESCRIPTIONBASE",


  		




  829
  829
  
    
            "AGENTBASE", "HOMOTYPICALGROUP",


  		












Also available in:  Unified diff