ref #9607 adapting to changes in image metadata factories

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
index 4687102726a3132fea4fe3050a40b035e34eab5f..ff5a05764f5f514492ff4a1eb5cc7f3a49437a73 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
@@ -9,15 +9,17 @@
 
 package eu.etaxonomy.taxeditor.ui.section.media;
 
+import java.net.URI;
+
+import javax.swing.plaf.basic.BasicFileChooserUI.SelectionListener;
+
 import org.apache.commons.io.FileUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.events.SelectionListener;
 
+import eu.etaxonomy.cdm.api.service.media.MediaMedadataFileReader;
 import eu.etaxonomy.cdm.common.media.CdmImageInfo;
-import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
@@ -48,7 +50,7 @@ public class ImageFileElement extends MediaRepresentationPartElement<ImageFile>
         @Override
         protected IStatus run(IProgressMonitor monitor) {
             try{
-                CdmImageInfo imageInfo = CdmImageInfo.NewInstanceWithMetaData(uri, 10000);
+                CdmImageInfo imageInfo = new MediaMedadataFileReader(uri).readBaseInfo().readMetaData().getCdmImageInfo();
                 ImageFileElement.this.getLayoutComposite().getDisplay().asyncExec(()->{
                     element_keyValue.setInput(imageInfo.getMetaData());
                     try {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
index 0772c921ce66f00ff2083492a34bc109bb0207f9..6c80c04777fcc41d0dab79beaf819f7d7ec8d9f3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
@@ -8,28 +8,29 @@
 */
 package eu.etaxonomy.taxeditor.ui.section.media;
 
+import java.awt.Button;
+import java.awt.Label;
 import java.io.IOException;
+import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
+import javax.print.attribute.standard.Media;
+
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.http.HttpException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Label;
 
-import eu.etaxonomy.cdm.common.URI;
+import eu.etaxonomy.cdm.api.service.media.MediaMedadataFileReader;
 import eu.etaxonomy.cdm.common.UriUtils;
 import eu.etaxonomy.cdm.common.media.CdmImageInfo;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.media.ImageFile;
-import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
 import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
 import eu.etaxonomy.cdm.model.media.MediaUtils;
@@ -74,7 +75,7 @@ public class MediaDetailElement extends AbstractCdmDetailElement<Media>{
 
                 UriUtils.getInputStream(uri);// will fail with a FileNotFoundException if not
 
-                CdmImageInfo imageInfo = CdmImageInfo.NewInstance(uri, 10000);//will fail when it is no image file
+                CdmImageInfo imageInfo = new MediaMedadataFileReader(uri).readBaseInfo().readMetaData().getCdmImageInfo(); //will fail when it is no image file
                 MediaDetailElement.this.getLayoutComposite().getDisplay().asyncExec(()->{
                     singleMediaRepresentationPart.setSize((int) imageInfo.getLength());
                     if(singleMediaRepresentationPart.isInstanceOf(ImageFile.class)){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java
index 187d1ff9d9cfc6e1294cea93bb97e979a62d98e2..e7d6adac402e1495e574106ce6280e6ba675dee5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java
@@ -10,16 +10,17 @@
 package eu.etaxonomy.taxeditor.ui.section.media;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.Collection;
 
+import javax.swing.plaf.basic.BasicFileChooserUI.SelectionListener;
+
 import org.apache.http.HttpException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.events.SelectionListener;
 
-import eu.etaxonomy.cdm.common.URI;
+import eu.etaxonomy.cdm.api.service.media.MediaMedadataFileReader;
 import eu.etaxonomy.cdm.common.UriUtils;
 import eu.etaxonomy.cdm.common.media.CdmImageInfo;
 import eu.etaxonomy.cdm.model.media.ImageFile;
@@ -97,7 +98,7 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement<
                         return Status.CANCEL_STATUS;
                     }
                     try {
-                       CdmImageInfo imageInfo = CdmImageInfo.NewInstance(uri, 10000);
+                       CdmImageInfo imageInfo = new MediaMedadataFileReader(uri).readBaseInfo().readMetaData().getCdmImageInfo();
                         String mimeType = imageInfo.getMimeType();
                         getEntity().setMimeType(mimeType);
                         getEntity().setSuffix(imageInfo.getSuffix());