ref #6925 Update part titles

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
index 55c3090364f63b2ac83c420eed625db01dd560f6..b7a7ec736b148f416134926076b223cc4779e880 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
@@ -22,6 +22,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PartInitException;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
@@ -36,6 +37,7 @@ import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToAcceptedTaxonOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonNodeSelectionDialog;
 
@@ -112,17 +114,14 @@ public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnab
 
                        // Open new unsaved editor with existing taxon's parent as temporary parent
                        TaxonNode newNode = (TaxonNode) objectAffectedByOperation;
-//                     TaxonNode newNode = parentNode.addChild(newTaxon);
-
-//                     try {
-                               // FIXME E4 this throws an exception
-//                             EditorUtil.openTaxonNodeE4(newNode.getUuid());
-//
-//                     } catch (PartInitException e) {
-//                             e.printStackTrace();
-//                     } catch (Exception e) {
-//                             MessagingUtils.warningDialog(Messages.ChangeSynonymToAcceptedTaxonHandler_CREATE_FAILURE, this, e.getMessage());
-//                     }
+
+                       try {
+                               EditorUtil.openTaxonNodeE4(newNode.getUuid());
+                       } catch (PartInitException e) {
+                               e.printStackTrace();
+                       } catch (Exception e) {
+                               MessagingUtils.warningDialog(Messages.ChangeSynonymToAcceptedTaxonHandler_CREATE_FAILURE, this, e.getMessage());
+                       }
                }
                return true;
        }

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 2cf38b559d386bc0eac9cca3326bf0ef4fde468a..646a66b351ee5343498fdc8fc1bba0ca873dd7c4 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
@@ -33,18 +33,18 @@ import org.eclipse.ui.IEditorPart;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
-import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;
 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.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
 import eu.etaxonomy.taxeditor.model.LineSelection;
-import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
 import eu.etaxonomy.taxeditor.view.e4.AbstractCdmEditorPartE4;
-import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
+import eu.etaxonomy.taxeditor.view.e4.details.DetailsPartE4;
+import eu.etaxonomy.taxeditor.view.e4.supplementaldata.SupplementalDataPartE4;
 
 /**
  *
@@ -72,7 +72,7 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
 
         Object partObject = createPartObject(activePart);
 
-        if (partObject instanceof DetailsViewPart || partObject instanceof SupplementalDataViewPart) {
+        if (partObject instanceof DetailsPartE4 || partObject instanceof SupplementalDataPartE4) {
             // do not show empty page as these views are also used to edit the
             // description selected in this view
             return;
@@ -89,7 +89,7 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
                else if(partObject instanceof AbstractGraphKeyEditor){
                        showEmptyPage();
                }
-               else if(partObject instanceof MultiPageTaxonEditor){
+               else if(partObject instanceof TaxonNameEditorE4){
                    IEditorInput input = ((IEditorPart) partObject).getEditorInput();
                    showViewer(new StructuredSelection(input), activePart, viewer);
                }
@@ -99,17 +99,10 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
 
        }
 
-    //FIXME E4 implement
-//     @Override
-//     protected String createPartTitle(Object selectedObject) {
-//             if(selectedObject instanceof TaxonEditorInput){
-//                     return super.createPartTitle(((TaxonEditorInput) selectedObject).getTaxon());
-//             }
-//             return super.createPartTitle(selectedObject);
-//     }
-
        @PostConstruct
-    public void create(Composite parent, EMenuService menuService) {
+    public void create(Composite parent, EMenuService menuService, MPart thisPart) {
+
+           this.thisPart = thisPart;
 
            ConceptRelationViewer conceptViewer = new ConceptRelationViewer(parent);
 

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 323e33f411fd57d7bf2727b6cd9fea85f5e2726a..e0b2e328d1a06422bb5b0639baf74c1d4aeb8d11 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
@@ -57,8 +57,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));
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
index c7081d65761e2a55145df245a84c380258bc0580..fdbc8843a1e80afb26a710b0bc1908208f6eac50 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
@@ -44,6 +44,8 @@ public abstract class AbstractCdmEditorPartE4
 
     protected Viewer viewer;
 
+    protected MPart thisPart;
+
     protected MPart selectionProvidingPart;
 
     /** {@inheritDoc} */
@@ -61,6 +63,20 @@ public abstract class AbstractCdmEditorPartE4
                 }
             }
         }
+        if(object!=null){
+            createPartTitle(object);
+        }
+    }
+
+    protected void createPartTitle(Object selectedObject){
+        if(thisPart!=null){
+            if(selectedObject!=null){
+                thisPart.setLabel(getViewName()+": "+selectedObject); //$NON-NLS-1$
+            }
+            else{
+                thisPart.setLabel(getViewName());
+            }
+        }
     }
 
     public Viewer getViewer() {
@@ -96,6 +112,7 @@ public abstract class AbstractCdmEditorPartE4
                 }
                viewer.setInput(element);
 
+               createPartTitle(element);
 
             }
             selectionProvidingPart = activePart;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
index 21a772fff4211a053c3decd9f1d353d1f5570fd2..6be81781b74444c57c1abacb5bf9a5fc7f944ea1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
@@ -47,7 +47,10 @@ public class DetailsPartE4 extends AbstractCdmEditorPartE4{
     }
 
     @PostConstruct
-    public void create(Composite parent) {
+    public void create(Composite parent, MPart thisPart) {
+
+        this.thisPart = thisPart;
+
         viewer = new DetailsViewerE4(parent, this);
 
         // Propagate selection from viewer

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
index 1235984c02e2bb601276c1d08667b4d39a84b9cf..82ee522255fce350989eb62ec330c659bd1a471e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
@@ -48,8 +48,11 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
     }
 
        @PostConstruct
-       public void create(Composite parent) {
-               viewer = new SupplementalDataViewerE4(parent, this);
+       public void create(Composite parent, MPart thisPart) {
+
+           this.thisPart = thisPart;
+
+           viewer = new SupplementalDataViewerE4(parent, this);
        }
 
        @Inject