Merge branch 'release/4.11.0'

[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 adf4c4c7d7d1faa58067d3a29855c8f82e31bc16..f48b568dc70135b6ea86b3678ed7c0c70667d7a1 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
@@ -10,13 +10,10 @@
 package eu.etaxonomy.taxeditor.editor.view.media.e4;
 
 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.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeNode;
@@ -28,9 +25,10 @@ import org.eclipse.swt.widgets.Tree;
 import eu.etaxonomy.cdm.model.description.IDescribable;
 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.concept.e4.ConceptViewPartE4;
+import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.media.MediaContentProvider;
-import eu.etaxonomy.taxeditor.editor.view.media.MediaLabelProvider;
+import eu.etaxonomy.taxeditor.editor.view.media.MediaViewLabelProvider;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
@@ -48,12 +46,7 @@ import eu.etaxonomy.taxeditor.view.e4.supplementaldata.SupplementalDataPartE4;
 public class MediaViewPartE4 extends AbstractCdmEditorPartE4
         implements IPartContentHasDetails, IPartContentHasSupplementalData {
 
-    private ISelectionChangedListener selectionChangedListener;
-
-       @Inject
-       private ESelectionService selService;
-
-       @PostConstruct
+    @PostConstruct
        public void create(Composite parent, EMenuService menuService, MPart thisPart) {
 
            this.thisPart = thisPart;
@@ -61,7 +54,12 @@ public class MediaViewPartE4 extends AbstractCdmEditorPartE4
                                | SWT.V_SCROLL | SWT.FULL_SELECTION));
 
                treeViewer.setContentProvider(new MediaContentProvider());
-               treeViewer.setLabelProvider(new MediaLabelProvider());
+               treeViewer.setLabelProvider(new MediaViewLabelProvider());
+
+//             TreeViewerColumn imagePreview = new TreeViewerColumn(treeViewer, SWT.NONE);
+//             imagePreview.setLabelProvider(new DelegatingStyledCellLabelProvider(
+//                new MediaViewLabelProvider(createImageDescriptor())));
+
                treeViewer.setAutoExpandLevel(2);
                viewer = treeViewer;
 
@@ -83,7 +81,7 @@ public class MediaViewPartE4 extends AbstractCdmEditorPartE4
            Object partObject = createPartObject(activePart);
 
            if (partObject instanceof DetailsPartE4 || partObject instanceof SupplementalDataPartE4
-                   || partObject instanceof DescriptiveViewPart) {
+                   || partObject instanceof FactualDataPartE4 || partObject instanceof ConceptViewPartE4) {
                // do not show empty page as these views are also used to edit the
                // description selected in this view
                return;
@@ -134,4 +132,6 @@ public class MediaViewPartE4 extends AbstractCdmEditorPartE4
                return Messages.MediaViewPart_MEDIA;
        }
 
+
+
 }