Revision 370503cf
Added by Niels Hoffmann almost 13 years ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java | ||
|---|---|---|
| 10 | 10 |
package eu.etaxonomy.cdm.io.berlinModel.in; |
| 11 | 11 |
|
| 12 | 12 |
import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_FACT_ALSO_PUBLISHED_IN; |
| 13 |
import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_FACT_PROTOLOGUE; |
|
| 14 | 13 |
import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_FACT_BIBLIOGRAPHY; |
| 15 |
|
|
| 14 |
import static eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer.NAME_FACT_PROTOLOGUE; |
|
| 16 | 15 |
|
| 17 | 16 |
import java.io.File; |
| 18 | 17 |
import java.io.IOException; |
| ... | ... | |
| 33 | 32 |
import org.springframework.stereotype.Component; |
| 34 | 33 |
|
| 35 | 34 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 36 |
import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
|
|
| 35 |
import eu.etaxonomy.cdm.common.media.ImageInfo;
|
|
| 37 | 36 |
import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelNameFactsImportValidator; |
| 38 | 37 |
import eu.etaxonomy.cdm.io.common.IOValidator; |
| 39 | 38 |
import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; |
| ... | ... | |
| 375 | 374 |
|
| 376 | 375 |
|
| 377 | 376 |
private ImageFile makeImage(String imageUri, Integer size, File file){
|
| 378 |
ImageMetaData imageMetaData = ImageMetaData.newInstance();
|
|
| 377 |
ImageInfo imageMetaData = null;
|
|
| 379 | 378 |
URI uri; |
| 380 | 379 |
try {
|
| 381 | 380 |
uri = new URI(imageUri); |
| 382 | 381 |
try {
|
| 383 |
imageMetaData.readMetaData(uri, 0);
|
|
| 382 |
imageMetaData = ImageInfo.NewInstance(uri, 0);
|
|
| 384 | 383 |
} catch (IOException e) {
|
| 385 | 384 |
logger.error("IOError reading image metadata." , e);
|
| 386 | 385 |
} catch (HttpException e) {
|
Also available in: Unified diff
Refactored MediaMetaData and family. Renamed it to MediaInfo. API is now less confusing and more consistent.