Project

General

Profile

« Previous | Next » 

Revision 443f1bb1

Added by Niels Hoffmann almost 14 years ago

merging the last changes from SPRINT-Cichoriea1 into trunk

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
22 22
import eu.etaxonomy.cdm.api.service.pager.Pager;
23 23
import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
24 24
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
25
import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
25 26
import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
26 27
import eu.etaxonomy.cdm.model.media.Media;
27 28
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
28 29
import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
30
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
29 31
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
32
import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
30 33
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
31 34
import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao;
32 35
import eu.etaxonomy.cdm.persistence.dao.occurrence.IOccurrenceDao;
......
126 129
			results = dao.list(type,determinedAs, pageSize, start, orderHints,propertyPaths);
127 130
		}
128 131
		return new DefaultPagerImpl<SpecimenOrObservationBase>(pageNumber, numberOfResults, pageSize, results);	}
132

  
133
	@Override
134
	public List<UuidAndTitleCache<DerivedUnitBase>> getDerivedUnitBaseUuidAndTitleCache() {
135
		return dao.getDerivedUnitBaseUuidAndTitleCache();
136
	}
137

  
138
	@Override
139
	public List<UuidAndTitleCache<FieldObservation>> getFieldObservationUuidAndTitleCache() {
140
		return dao.getFieldObservationUuidAndTitleCache();
141
	}
129 142
}

Also available in: Unified diff