Revision 370503cf
Added by Niels Hoffmann almost 13 years ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 25 | 25 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 26 |
import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
|
|
| 26 |
import eu.etaxonomy.cdm.common.media.ImageInfo;
|
|
| 27 | 27 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 28 | 28 |
import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer; |
| 29 | 29 |
import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException; |
| ... | ... | |
| 646 | 646 |
if( multimediaObject == null){
|
| 647 | 647 |
return null; |
| 648 | 648 |
} else {
|
| 649 |
ImageMetaData imd = ImageMetaData.newInstance();
|
|
| 649 |
ImageInfo imd = null;
|
|
| 650 | 650 |
URI uri; |
| 651 | 651 |
try {
|
| 652 | 652 |
uri = new URI(multimediaObject); |
| 653 | 653 |
try {
|
| 654 | 654 |
if (readDataFromUrl){
|
| 655 |
imd.readMetaData(uri, 0);
|
|
| 655 |
imd = ImageInfo.NewInstance(uri, 0);
|
|
| 656 | 656 |
} |
| 657 | 657 |
} catch (Exception e) {
|
| 658 | 658 |
String message = "An error occurred when trying to read image meta data: " + e.getMessage(); |
Also available in: Unified diff
Refactored MediaMetaData and family. Renamed it to MediaInfo. API is now less confusing and more consistent.