Merge branch 'develop' into bulkEditorE4

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / concept / e4 / ConceptViewPartE4.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/ConceptViewPartE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/ConceptViewPartE4.java
index 6b2401a51d589ca009b35a460a897b4c8a1c49f5..fa5b5589c7c34e5db527db00dc17ddfc7cffa2e8 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/ConceptViewPartE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/ConceptViewPartE4.java
@@ -12,13 +12,10 @@ package eu.etaxonomy.taxeditor.editor.view.concept.e4;
 import java.util.Map.Entry;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.services.EMenuService;
-import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -33,6 +30,8 @@ import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
 import eu.etaxonomy.taxeditor.editor.view.concept.ConceptContentProvider;
 import eu.etaxonomy.taxeditor.editor.view.concept.ConceptLabelProvider;
+import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
+import eu.etaxonomy.taxeditor.editor.view.media.e4.MediaViewPartE4;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
@@ -50,11 +49,6 @@ import eu.etaxonomy.taxeditor.view.e4.supplementaldata.SupplementalDataPartE4;
 public class ConceptViewPartE4 extends AbstractCdmEditorPartE4
 implements IPartContentHasDetails, IPartContentHasSupplementalData{
 
-    private ISelectionChangedListener selectionChangedListener;
-
-    @Inject
-    private ESelectionService selService;
-
     @Override
     public void selectionChanged_internal(Object selection, MPart activePart, MPart thisPart) {
         if(activePart==thisPart){
@@ -63,7 +57,8 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
 
         Object partObject = createPartObject(activePart);
 
-        if (partObject instanceof DetailsPartE4 || partObject instanceof SupplementalDataPartE4) {
+        if (partObject instanceof DetailsPartE4 || partObject instanceof SupplementalDataPartE4
+                || partObject instanceof FactualDataPartE4|| partObject instanceof MediaViewPartE4) {
             // do not show empty page as these views are also used to edit the
             // description selected in this view
             return;