Revision 370503cf
Added by Niels Hoffmann almost 13 years ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDDataSetImport.java | ||
|---|---|---|
| 32 | 32 |
|
| 33 | 33 |
import eu.etaxonomy.cdm.api.service.IDescriptionService; |
| 34 | 34 |
import eu.etaxonomy.cdm.common.IProgressMonitor; |
| 35 |
import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
|
|
| 35 |
import eu.etaxonomy.cdm.common.media.ImageInfo;
|
|
| 36 | 36 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 37 |
import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport; |
|
| 38 | 37 |
import eu.etaxonomy.cdm.io.common.CdmImportBase; |
| 39 | 38 |
import eu.etaxonomy.cdm.io.common.ICdmIO; |
| 40 | 39 |
import eu.etaxonomy.cdm.io.common.ICdmImport; |
| ... | ... | |
| 1595 | 1594 |
Element elSource = elMO.getChild("Source",sddNamespace);
|
| 1596 | 1595 |
String href = elSource.getAttributeValue("href");
|
| 1597 | 1596 |
|
| 1598 |
ImageMetaData imageMetaData = ImageMetaData.newInstance();
|
|
| 1597 |
ImageInfo imageMetaData = null;
|
|
| 1599 | 1598 |
ImageFile image = null; |
| 1600 | 1599 |
if (href.substring(0,7).equals("http://")) {
|
| 1601 | 1600 |
try{
|
| 1602 | 1601 |
URL url = new URL(href); |
| 1603 | 1602 |
|
| 1604 |
imageMetaData.readMetaData(url.toURI(), 0);
|
|
| 1603 |
imageMetaData = ImageInfo.NewInstance(url.toURI(), 0);
|
|
| 1605 | 1604 |
image = ImageFile.NewInstance(url.toURI(), null, imageMetaData); |
| 1606 | 1605 |
} catch (MalformedURLException e) {
|
| 1607 | 1606 |
logger.error("Malformed URL", e);
|
| ... | ... | |
| 1612 | 1611 |
File parent = f.getParentFile(); |
| 1613 | 1612 |
String fi = parent.toString() + File.separator + href; |
| 1614 | 1613 |
File file = new File(fi); |
| 1615 |
imageMetaData.readMetaData(new URI(fi), 0); //file
|
|
| 1614 |
imageMetaData = ImageInfo.NewInstance(new URI(fi), 0); //file
|
|
| 1616 | 1615 |
image = ImageFile.NewInstance(file.toURI(), null, imageMetaData); |
| 1617 | 1616 |
} |
| 1618 | 1617 |
MediaRepresentation representation = MediaRepresentation.NewInstance(imageMetaData.getMimeType(), null); |
Also available in: Unified diff
Refactored MediaMetaData and family. Renamed it to MediaInfo. API is now less confusing and more consistent.