fix #6669 Refresh context menu before it is drawn

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index 00bcc23f174f97c644bdde4ed9c6af51817d4111..510d01d4986c4b1a6069c44b3baa2982f12993d5 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -147,6 +147,7 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
         getSite().registerContextMenu(menuManager, viewer);
         Control control = viewer.getControl();
         Menu menu = menuManager.createContextMenu(control);
+        menuManager.setRemoveAllWhenShown(true);
         control.setMenu(menu);
 
         // Propagate selection from viewer

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java
index 79e9985d356b972ce4ed64def10b0a6d36178bdd..a4b8ff6f9c8b2b05d2c5096c4673ea64f640b8cd 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java
@@ -47,7 +47,7 @@ import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
  * @created Jan 24, 2011
  * @version 1.0
  */
-public class ConceptViewPart extends AbstractCdmEditorViewPart 
+public class ConceptViewPart extends AbstractCdmEditorViewPart
 implements IPartContentHasDetails, IPartContentHasSupplementalData{
 
        public static final String ID = "eu.etaxonomy.taxeditor.editor.view.concept"; //$NON-NLS-1$
@@ -63,7 +63,7 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
                        showEmptyPage();
                        return;
                }
-               
+
         if (part instanceof DetailsViewPart || part instanceof SupplementalDataViewPart) {
             // do not show empty page as these views are also used to edit the
             // description selected in this view
@@ -93,7 +93,7 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
                }
 
        }
-       
+
        @Override
        protected String createPartTitle(Object selectedObject) {
                if(selectedObject instanceof TaxonEditorInput){
@@ -135,6 +135,7 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
 
                Control control = viewer.getControl();
                Menu menu = menuManager.createContextMenu(control);
+               menuManager.setRemoveAllWhenShown(true);
 
                control.setMenu(menu);
        }
@@ -149,8 +150,8 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
 
                public ConceptRelationViewer(Composite parent) {
                        super(parent);
-               } 
-               
+               }
+
                @Override
                public ISelection getSelection() {
                        ISelection selection = super.getSelection();
@@ -158,11 +159,11 @@ implements IPartContentHasDetails, IPartContentHasSupplementalData{
                                Object firstElement = ((IStructuredSelection) selection).getFirstElement();
                                TaxonRelationship taxonRelationship = ((Entry<TaxonRelationship, Taxon>)firstElement).getKey();
                                return new StructuredSelection(taxonRelationship);
-                               
+
                        }
                        return selection;
                }
-               
+
                @Override
                public void setSelection(ISelection selection) {
                        super.setSelection(selection);

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 ae339497d2ad13f3a5d5f8a0ee4ee1e5fc466e16..1572119d54b7866220ca5786ea1a5f19e0ecad35 100644 (file)
--- 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
@@ -71,6 +71,7 @@ public class MediaViewPart extends AbstractCdmEditorViewPart implements IPartCon
 
                Control control = viewer.getControl();
                Menu menu = menuMgr.createContextMenu(control);
+               menuMgr.setRemoveAllWhenShown(true);
                control.setMenu(menu);
 
        }
@@ -136,7 +137,7 @@ public class MediaViewPart extends AbstractCdmEditorViewPart implements IPartCon
                ((BulkEditor) part).forceDirty();
                IStructuredSelection selection = (IStructuredSelection) ((BulkEditor) part).getSelectionProvider().getSelection();
             ((BulkEditor) part).changed(selection.getFirstElement());
-            
+
            }
            super.changed(object);
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
index 08bcce217e492eb28ceefd4710f4c0057d715125..4c2a95689da2469cd73be1a3eb6bf9e9a696b400 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
@@ -138,6 +138,7 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
 \r
                Control control = viewer.getControl();\r
                Menu menu = menuManager.createContextMenu(control);\r
+               menuManager.setRemoveAllWhenShown(true);\r
                control.setMenu(menu);\r
        }\r
 \r