adapt TaxEditor to reverting changes in MediaInfoFileReader

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 072348fe7917922393cd0bafb6a537e9cb1cd5c5..981d6655e2a8ab2f1d24c9af1d2f39f9d972ad9b 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
@@ -49,7 +49,7 @@ public class ImageFileElement extends MediaRepresentationPartElement<ImageFile>
         protected IStatus run(IProgressMonitor monitor) {
             try{
 
-                CdmImageInfo imageInfo = MediaInfoFileReader.legacyFactoryMethod(uri).readBaseInfo(true).getCdmImageInfo();
+                CdmImageInfo imageInfo = MediaInfoFileReader.legacyFactoryMethod(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 2ade71607da5683ae93e12239c5ef0fe6336ae6e..375969dd5043ba53d60fdd5334e0e6659b959bc6 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
@@ -80,7 +80,7 @@ public class MediaDetailElement extends AbstractCdmDetailElement<Media>{
                 }
 
 
-                CdmImageInfo imageInfo = MediaInfoFileReader.legacyFactoryMethod(uri).readBaseInfo(true).getCdmImageInfo(); //will fail when it is no image file
+                CdmImageInfo imageInfo = MediaInfoFileReader.legacyFactoryMethod(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 79fcffb8f60bcd49effa9158b459f1391e46ecce..4aebb61c80549c4944311d0bb4b7df4a42eff262 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
@@ -103,7 +103,7 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement<
                         return Status.CANCEL_STATUS;
                     }
                     try {
-                        CdmImageInfo imageInfo = MediaInfoFileReader.legacyFactoryMethod(uri).readBaseInfo(true).getCdmImageInfo();
+                        CdmImageInfo imageInfo = MediaInfoFileReader.legacyFactoryMethod(uri).readBaseInfo().readMetaData().getCdmImageInfo();
                         String mimeType = imageInfo.getMimeType();
                         getEntity().setMimeType(mimeType);
                         getEntity().setSuffix(imageInfo.getSuffix());