Revision 370503cf
Added by Niels Hoffmann almost 13 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java | ||
|---|---|---|
| 23 | 23 |
import org.hibernate.envers.Audited; |
| 24 | 24 |
import org.joda.time.DateTime; |
| 25 | 25 |
|
| 26 |
import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
|
|
| 26 |
import eu.etaxonomy.cdm.common.media.ImageInfo;
|
|
| 27 | 27 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 28 | 28 |
|
| 29 | 29 |
/** |
| ... | ... | |
| 60 | 60 |
return new ImageFile(uri, size, height, width); |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 |
public static ImageFile NewInstance(URI uri, Integer size, ImageMetaData imageMetaData){
|
|
| 64 |
return new ImageFile(uri, size, imageMetaData.getHeight(), imageMetaData.getWidth()); |
|
| 63 |
public static ImageFile NewInstance(URI uri, Integer size, ImageInfo imageMetaData){
|
|
| 64 |
ImageFile imageFile = NewInstance(uri, size); |
|
| 65 |
|
|
| 66 |
if(imageMetaData != null){
|
|
| 67 |
imageFile.setHeight(imageMetaData.getHeight()); |
|
| 68 |
imageFile.setWidth(imageMetaData.getWidth()); |
|
| 69 |
} |
|
| 70 |
|
|
| 71 |
return imageFile; |
|
| 65 | 72 |
} |
| 66 | 73 |
|
| 67 | 74 |
/** |
Also available in: Unified diff
Refactored MediaMetaData and family. Renamed it to MediaInfo. API is now less confusing and more consistent.