Merge branch 'release/5.28.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / media / MediaMetaElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
index 73668912755738917503bbd0d5d534732d1d8a91..1c01a29d97e6d0175a624a442fe13b93a86d3c9c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
@@ -92,26 +92,23 @@ public class MediaMetaElement extends AbstractEntityCollectionElement<Media> imp
             mediaDetailElement.setShowImage(false);
         }
         addElement(mediaDetailElement);
+        if (entity != null){
+               setEntity(entity);
+        }
     }
 
     @Override
     public void setEntity(Media element) {
         this.entity = element;
-        mediaDetailElement.setEntity(element);
-
-        selection_artist.setEntity(HibernateProxyHelper
-                .deproxy(element.getArtist()));
-
-        text_description.setMultilanguageText(element.getAllDescriptions());
-
-//        if (CdmUtils.isBlank(text_description.getText())){
-//             Map<Language, LanguageString> allDescriptions = element.getAllDescriptions();
-//             if (!allDescriptions.isEmpty()){
-//                     text_description.setLanguageString(allDescriptions.get(Language.ENGLISH()));
-//             }
-//        }
-
-        createTitle();
+        if (mediaDetailElement != null){
+               mediaDetailElement.setEntity(element);
+       
+               selection_artist.setEntity(HibernateProxyHelper
+                       .deproxy(element.getArtist()));
+       
+               text_description.setMultilanguageText(element.getAllDescriptions());
+               createTitle();
+        }
     }
 
     public void createTitle() {