Project

General

Profile

« Previous | Next » 

Revision 44b88189

Added by Patrick Plitzner about 9 years ago

  • refactored DTO assembly for compressed specimen table in the data portal
    • now data is assembled for each individual preserved specimen and the for the parent field unit

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
32 32 
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
33 33 
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
34 34 
import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
35 
import eu.etaxonomy.cdm.api.service.dto.DerivateHierarchyDTO;
35 
import eu.etaxonomy.cdm.api.service.dto.DerivateDTO;
36 
import eu.etaxonomy.cdm.api.service.dto.FieldUnitDTO;
36 37 
import eu.etaxonomy.cdm.api.service.dto.FindByIdentifierDTO;
38 
import eu.etaxonomy.cdm.api.service.dto.PreservedSpecimenDTO;
37 39 
import eu.etaxonomy.cdm.api.service.pager.Pager;
38 40 
import eu.etaxonomy.cdm.api.service.search.SearchResult;
39 41 
import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
......
50 52 
import eu.etaxonomy.cdm.model.common.MarkerType;
51 53 
import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
52 54 
import eu.etaxonomy.cdm.model.description.DescriptionBase;
55 
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
53 56 
import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
54 57 
import eu.etaxonomy.cdm.model.location.Country;
55 58 
import eu.etaxonomy.cdm.model.media.Media;
......
936 939 
	}
937 940 

  		




  938
  941
  
    

  		




  939
  
  
    
    @Override


  		




  940
  
  
    
    public DerivateHierarchyDTO assembleDerivateHierarchyDTO(FieldUnit fieldUnit, UUID associatedTaxonUuid) {


  		




  941
  
  
    
        return defaultService.assembleDerivateHierarchyDTO(fieldUnit, associatedTaxonUuid);


  		




  942
  
  
    
    }


  		




  
  942
  
    
	/* (non-Javadoc)


  		




  
  943
  
    
	 * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assembleFieldUnitDTO(eu.etaxonomy.cdm.model.occurrence.FieldUnit, java.util.UUID)


  		




  
  944
  
    
	 */


  		




  
  945
  
    
	@Override


  		




  
  946
  
    
	public FieldUnitDTO assembleFieldUnitDTO(FieldUnit fieldUnit, UUID associatedTaxonUuid) {


  		




  
  947
  
    
	    return defaultService.assembleFieldUnitDTO(fieldUnit, associatedTaxonUuid);


  		




  
  948
  
    
	}


  		




  
  949
  
    

  		




  
  950
  
    
	/* (non-Javadoc)


  		




  
  951
  
    
	 * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#assemblePreservedSpecimenDTO(eu.etaxonomy.cdm.model.occurrence.DerivedUnit)


  		




  
  952
  
    
	 */


  		




  
  953
  
    
	@Override


  		




  
  954
  
    
	public PreservedSpecimenDTO assemblePreservedSpecimenDTO(DerivedUnit derivedUnit) {


  		




  
  955
  
    
	    return defaultService.assemblePreservedSpecimenDTO(derivedUnit);


  		




  
  956
  
    
	}


  		




  943
  957
  
    

  		




  944
  958
  
    
    @Override


  		




  945
  959
  
    
    public Collection<ICdmBase> getNonCascadedAssociatedElements(SpecimenOrObservationBase<?> specimen) {


  		




  ......




  995
  1009
  
    
		return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);


  		




  996
  1010
  
    
	}


  		




  997
  1011
  
    

  		




  
  1012
  
    
	/* (non-Javadoc)


  		




  
  1013
  
    
	 * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getCharacterDataForSpecimen(eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase)


  		




  
  1014
  
    
	 */


  		




  
  1015
  
    
	@Override


  		




  
  1016
  
    
	public Collection<DescriptionElementBase> getCharacterDataForSpecimen(SpecimenOrObservationBase<?> arg0) {


  		




  
  1017
  
    
	    return defaultService.getCharacterDataForSpecimen(arg0);


  		




  
  1018
  
    
	}


  		




  
  1019
  
    

  		




  
  1020
  
    
	/* (non-Javadoc)


  		




  
  1021
  
    
	 * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getCharacterDataForSpecimen(java.util.UUID)


  		




  
  1022
  
    
	 */


  		




  
  1023
  
    
	@Override


  		




  
  1024
  
    
	public Collection<DescriptionElementBase> getCharacterDataForSpecimen(UUID arg0) {


  		




  
  1025
  
    
	    return getCharacterDataForSpecimen(arg0);


  		




  
  1026
  
    
	}


  		




  
  1027
  
    

  		




  998
  1028
  
    
}


  		












Also available in:  Unified diff