From 1cefc3d92b8a40aaeb2120c42b7d842543d18282 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Mon, 23 Feb 2015 09:48:02 +0000 Subject: [PATCH] - fixed MediaViewPart selection listening (#4575) --- .../editor/view/media/MediaViewPart.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 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 809aa1e26..67fc3ed3f 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 @@ -10,14 +10,10 @@ package eu.etaxonomy.taxeditor.editor.view.media; -import java.util.HashMap; -import java.util.Map; - import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeNode; import org.eclipse.jface.viewers.TreeViewer; @@ -32,18 +28,11 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPart; -import eu.etaxonomy.cdm.model.description.DescriptionBase; -import eu.etaxonomy.cdm.model.description.IDescribable; -import eu.etaxonomy.cdm.model.media.IMediaDocumented; 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.DescriptiveContentProvider; -import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.taxeditor.model.AbstractUtility; -import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree; import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; -import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData; import eu.etaxonomy.taxeditor.model.IPartContentHasMedia; import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData; import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart; @@ -64,7 +53,7 @@ public class MediaViewPart extends AbstractCdmEditorViewPart implements IPartCon private TreeViewer viewer; - + /* * (non-Javadoc) * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite) @@ -75,7 +64,7 @@ public class MediaViewPart extends AbstractCdmEditorViewPart implements IPartCon viewer = new TreeViewer(new Tree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION)); - + viewer.setContentProvider(new MediaContentProvider()); viewer.setLabelProvider(new MediaLabelProvider()); viewer.setAutoExpandLevel(2); @@ -128,9 +117,7 @@ public class MediaViewPart extends AbstractCdmEditorViewPart implements IPartCon IEditorInput input = ((IEditorPart) part).getEditorInput(); showViewer(part, new StructuredSelection(input)); } - else if(selection instanceof IStructuredSelection - && ((IStructuredSelection) selection).getFirstElement() instanceof IDescribable - && part instanceof IPartContentHasFactualData && !(((IStructuredSelection) selection).getFirstElement() instanceof SpecimenOrObservationBase && part instanceof BulkEditor)){ + else if(selection instanceof IStructuredSelection){ Object firstElement = ((IStructuredSelection) selection).getFirstElement(); if(firstElement instanceof TreeNode){ showViewer(part, new StructuredSelection(((TreeNode) firstElement).getValue())); -- 2.34.1