Revision 9d43097c
Added by Andreas Müller almost 4 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java | ||
|---|---|---|
| 22 | 22 |
import org.apache.log4j.Logger; |
| 23 | 23 |
import org.hibernate.envers.Audited; |
| 24 | 24 |
|
| 25 |
import eu.etaxonomy.cdm.common.media.ImageInfo; |
|
| 25 |
import eu.etaxonomy.cdm.common.media.CdmImageInfo;
|
|
| 26 | 26 |
import eu.etaxonomy.cdm.model.agent.AgentBase; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.TimePeriod; |
| 28 | 28 |
|
| ... | ... | |
| 59 | 59 |
return new ImageFile(uri, size, height, width); |
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 |
public static ImageFile NewInstance(URI uri, Integer size, ImageInfo imageInfo){
|
|
| 62 |
public static ImageFile NewInstance(URI uri, Integer size, CdmImageInfo cdmImageInfo){
|
|
| 63 | 63 |
ImageFile imageFile = NewInstance(uri, size); |
| 64 | 64 |
|
| 65 |
if(imageInfo != null){
|
|
| 66 |
imageFile.setHeight(imageInfo.getHeight());
|
|
| 67 |
imageFile.setWidth(imageInfo.getWidth());
|
|
| 68 |
if(imageInfo.getLength() != 0){
|
|
| 69 |
imageFile.setSize((int)imageInfo.getLength());
|
|
| 65 |
if(cdmImageInfo != null){
|
|
| 66 |
imageFile.setHeight(cdmImageInfo.getHeight());
|
|
| 67 |
imageFile.setWidth(cdmImageInfo.getWidth());
|
|
| 68 |
if(cdmImageInfo.getLength() != 0){
|
|
| 69 |
imageFile.setSize((int)cdmImageInfo.getLength());
|
|
| 70 | 70 |
} |
| 71 | 71 |
} |
| 72 | 72 |
|
Also available in: Unified diff
ref #9148 change the name of CDM class ImageInfo to CdmImageInfo to avoid name calsh with commons-imaging/ImageInfo