Merge branch 'develop' into bulkEditorE4

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / name / e4 / container / AbstractGroupE4.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java
index da149bce1fa13a85a5820e2834fbb1bbf4f75419..c86eb9ab3039712845f67d18f3043dc46fb9d827 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java
@@ -20,15 +20,14 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.taxeditor.editor.CdmDataTransfer;
-import eu.etaxonomy.taxeditor.editor.name.dnd.NameEditorDropTargetEffect;
 import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetableE4;
 import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetEffect;
 import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetListenerE4;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.preference.Resources;
@@ -66,7 +65,7 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
        }
 
        protected void createControl() {
-               control = editor.getToolkit().createComposite(editor.getManagedForm().getForm());
+               control = editor.getToolkit().createComposite(editor.getControl());
 
                control.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
                TableWrapLayout layout = new TableWrapLayout();
@@ -176,14 +175,6 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
                }
        }
 
-       public void setMenu(Menu menu) {
-               getControl().setMenu(menu);
-               for(AbstractGroupedContainerE4 container : getGroupedContainers()){
-                       container.setMenu(menu);
-               }
-
-       }
-
        protected void emptyGroup(){
                for(AbstractGroupedContainerE4 container : groupedContainers){
                        container.dispose();