#4855 add MoveSynonymToAnotherAcceptedTaxonHandler and some clean up of the plugin...

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / media / MediaContentProvider.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
index 0e4a261059b225fe59d662dbec7a4aef007943dd..cf5aa8cc74f88054b13f14a92ae81914b11f3ec7 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
@@ -72,7 +72,12 @@ public class MediaContentProvider implements ITreeContentProvider{
                }
                else if (parentElement instanceof DescriptionBase) {
                        if (((DescriptionBase) parentElement).isImageGallery()) {
-                               return getImages((DescriptionBase) parentElement).toArray();
+                               List<Media> images =  getImages((DescriptionBase) parentElement);
+                               if (images != null){
+                                       return images.toArray();
+                               } 
+                               return null;
+                               
                        }
                }
                else if (parentElement instanceof DerivedUnit){
@@ -111,6 +116,9 @@ public class MediaContentProvider implements ITreeContentProvider{
        /** {@inheritDoc} */
        @Override
     public boolean hasChildren(Object element) {
+               if (getChildren(element)== null) {
+                       return false;
+               }
                return (getChildren(element).length > 0);
        }
 
@@ -139,10 +147,12 @@ public class MediaContentProvider implements ITreeContentProvider{
                        if(elements.size() > 1){
                                MessagingUtils.error(this.getClass(), "There should be one and only one description element to hold the images. Found: " + elements.size() + " InDescription ID: " + description.getUuid(), null);
                        }
+                       if (!elements.isEmpty()){
+                               DescriptionElementBase element = elements.iterator().next();
+                               return element.getMedia();
+                       }
 
-                       DescriptionElementBase element = elements.iterator().next();
-
-                       return element.getMedia();
+                       
                }
                return null;
        }