Merge branch 'develop' into nameEditorE4

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

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java
index 5348c7db59960b89fe0968322cfa397c7736b087..adf4c4c7d7d1faa58067d3a29855c8f82e31bc16 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java
@@ -26,8 +26,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Tree;
 
 import eu.etaxonomy.cdm.model.description.IDescribable;
-import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
 import eu.etaxonomy.taxeditor.editor.view.media.MediaContentProvider;
 import eu.etaxonomy.taxeditor.editor.view.media.MediaLabelProvider;
@@ -54,8 +54,9 @@ public class MediaViewPartE4 extends AbstractCdmEditorPartE4
        private ESelectionService selService;
 
        @PostConstruct
-       public void create(Composite parent, EMenuService menuService) {
+       public void create(Composite parent, EMenuService menuService, MPart thisPart) {
 
+           this.thisPart = thisPart;
                TreeViewer treeViewer = new TreeViewer(new Tree(parent, SWT.H_SCROLL
                                | SWT.V_SCROLL | SWT.FULL_SELECTION));
 
@@ -96,8 +97,8 @@ public class MediaViewPartE4 extends AbstractCdmEditorPartE4
                }
 
                Object firstElement = structuredSelection.getFirstElement();
-               if (partObject instanceof MultiPageTaxonEditor){
-                   if (firstElement != ((MultiPageTaxonEditor)partObject).getTaxon()){
+               if (partObject instanceof TaxonNameEditorE4){
+                   if (firstElement != ((TaxonNameEditorE4)partObject).getTaxon()){
                        showEmptyPage();
                        return;
                    }