ref #7056 Generate titleCache for newly created image galleries

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaLabelProvider.java
deleted file mode 100644 (file)
index 2a1b94c..0000000
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaLabelProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package eu.etaxonomy.taxeditor.editor.view.media;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-
-/**
- * <p>MediaLabelProvider class.</p>
- *
- * @author n.hoffmann
- * @version $Id: $
- */
-public class MediaLabelProvider extends ColumnLabelProvider {
-
-       /** {@inheritDoc} */
-       @Override
-    public String getText(Object element) {
-               if(element instanceof IdentifiableEntity){
-                       return ((IdentifiableEntity) element).getTitleCache();
-               }
-
-               return element.toString();
-       }
-
-
-
-}

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewLabelProvider.java
index 09dbdbbfa5fea1a928ff7d6212560f35bbc5e7e1..565c6e0b710f1a2ca0175e5de827add28415a8a2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewLabelProvider.java
@@ -36,13 +36,24 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  */
 public class MediaViewLabelProvider extends LabelProvider implements IStyledLabelProvider {
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getText(Object element) {
+        return getStyledText(element).getString();
+    }
+
     @Override
     public StyledString getStyledText(Object element) {
         if (element instanceof IdentifiableEntity) {
             IdentifiableEntity identifiableEntity= (IdentifiableEntity) element;
-            StyledString styledString = new StyledString(identifiableEntity.getTitleCache());
-
-            return styledString;
+            if(identifiableEntity.getId()==0){
+                return new StyledString(identifiableEntity.generateTitle());
+            }
+            else{
+                return new StyledString(identifiableEntity.getTitleCache());
+            }
         }
         return null;
     }