Revision 370503cf
Added by Niels Hoffmann almost 13 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MediaServiceImpl.java | ||
|---|---|---|
| 29 | 29 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 30 | 30 |
import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl; |
| 31 | 31 |
import eu.etaxonomy.cdm.common.IProgressMonitor; |
| 32 |
import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
|
|
| 32 |
import eu.etaxonomy.cdm.common.media.ImageInfo;
|
|
| 33 | 33 |
import eu.etaxonomy.cdm.model.description.MediaKey; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.media.Media; |
| 36 | 36 |
import eu.etaxonomy.cdm.model.media.Rights; |
| 37 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
|
| 38 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
|
| 39 | 37 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 40 | 38 |
import eu.etaxonomy.cdm.persistence.dao.media.IMediaDao; |
| 41 | 39 |
import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy; |
| 42 |
import eu.etaxonomy.cdm.strategy.cache.media.MediaDefaultCacheStrategy; |
|
| 43 | 40 |
|
| 44 | 41 |
@Service |
| 45 | 42 |
@Transactional(readOnly=true, propagation = Propagation.SUPPORTS) |
| ... | ... | |
| 72 | 69 |
return new DefaultPagerImpl<Rights>(pageNumber, numberOfResults, pageSize, results); |
| 73 | 70 |
} |
| 74 | 71 |
|
| 75 |
|
|
| 76 |
public ImageMetaData getImageInfo(URI imageUri, Integer timeOut) throws IOException, HttpException{
|
|
| 77 |
ImageMetaData imageMetaData = ImageMetaData.newInstance();
|
|
| 78 |
imageMetaData.readImageInfo(imageUri, timeOut);
|
|
| 79 |
imageMetaData.readMetaData(imageUri, timeOut);
|
|
| 72 |
|
|
| 73 |
@Deprecated // it does not make much sense to have this encapsulated in a service method, use ImageInfo directly
|
|
| 74 |
public ImageInfo getImageInfo(URI imageUri, Integer timeOut) throws IOException, HttpException{
|
|
| 75 |
ImageInfo imageInfo = ImageInfo.NewInstance(imageUri, timeOut);
|
|
| 76 |
imageInfo.readMetaData(timeOut);
|
|
| 80 | 77 |
|
| 81 |
return imageMetaData;
|
|
| 78 |
return imageInfo;
|
|
| 82 | 79 |
} |
| 83 | 80 |
|
| 81 |
@Deprecated // it does not make much sense to have this encapsulated in a service method, use ImageInfo directly |
|
| 84 | 82 |
public Map<String,String> getImageMetaData(URI imageUri, Integer timeOut) throws IOException, HttpException{
|
| 85 | 83 |
|
| 86 |
ImageMetaData imageMetaData = ImageMetaData.newInstance(); |
|
| 87 |
imageMetaData.readMetaData(imageUri, timeOut); |
|
| 88 |
|
|
| 84 |
ImageInfo imageInfo = ImageInfo.NewInstance(imageUri, timeOut); |
|
| 89 | 85 |
|
| 90 |
return imageMetaData.getMetaData();
|
|
| 86 |
return imageInfo.getMetaData();
|
|
| 91 | 87 |
} |
| 92 | 88 |
|
| 93 | 89 |
/* |
| 94 | 90 |
* (non-Javadoc) |
| 95 | 91 |
* @see eu.etaxonomy.cdm.api.service.IMediaService#getImageSize(java.net.URI, java.lang.Integer) |
| 96 | 92 |
*/ |
| 93 |
@Deprecated // it does not make much sense to have this encapsulated in a service method, use ImageInfo directly |
|
| 97 | 94 |
public Integer getImageSize(URI imageUri, Integer timeOut) {
|
| 98 | 95 |
try {
|
| 99 | 96 |
URL url = imageUri.toURL(); |
Also available in: Unified diff
Refactored MediaMetaData and family. Renamed it to MediaInfo. API is now less confusing and more consistent.