From a4350d138ee117782aadf82921119f7e3c869785 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 21 Sep 2015 09:44:30 +0200 Subject: [PATCH] Disable media view when synonym selected (#5195) --- .../taxeditor/editor/view/media/MediaViewPart.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java index 7bfee153d..46f55589c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java @@ -23,14 +23,12 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Tree; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPart; +import eu.etaxonomy.cdm.model.description.IDescribable; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; -import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor; import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart; import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; @@ -106,12 +104,8 @@ public class MediaViewPart extends AbstractCdmEditorViewPart implements IPartCon } if(part instanceof IPartContentHasMedia && ((IPartContentHasMedia) part).canAttachMedia()){ - if(part instanceof MultiPageTaxonEditor){ - IEditorInput input = ((IEditorPart) part).getEditorInput(); - showViewer(part, new StructuredSelection(input)); - return; - } - else if(selection instanceof IStructuredSelection){ + if(selection instanceof IStructuredSelection + && ((IStructuredSelection) selection).getFirstElement() instanceof IDescribable){ Object firstElement = ((IStructuredSelection) selection).getFirstElement(); if(firstElement instanceof TreeNode){ showViewer(part, new StructuredSelection(((TreeNode) firstElement).getValue())); -- 2.34.1