1 files changed, 1 insertions, 37 deletions

diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java
index 1d33f34d5..b23f1cdb0 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFSelectLifecycleManager.java
@@ -40,16 +40,12 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.sirius.common.interpreter.api.IInterpreter;
 import org.eclipse.sirius.common.interpreter.api.IVariableManager;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
@@ -95,11 +91,6 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager
 	private SelectionListener selectionListener;
 
 	/**
-	 * The mouse listener on the combo.
-	 */
-	private MouseListener mouseListener;
-
-	/**
 	 * The reference value of the selection, as last rendered from the state of the actual model.
 	 */
 	private ISelection referenceValue;
@@ -210,27 +201,6 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager
 		};
 		this.combo.addSelectionListener(this.selectionListener);
 
-		this.mouseListener = new MouseListener() {
-
-			@Override
-			public void mouseDoubleClick(MouseEvent e) {
-				// Nothing to do
-			}
-
-			@Override
-			public void mouseDown(MouseEvent e) {
-				// Delay the computation of the candidates until the user click on the combo
-				controller.computeCandidates();
-			}
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				// Nothing to do
-			}
-
-		};
-		this.combo.addMouseListener(this.mouseListener);
-
 		// Set combo value
 		this.controller.onNewValue(new IConsumer<Object>() {
 			@Override
@@ -254,8 +224,7 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager
 		// Set combo items
 		this.controller.onNewCandidates(new IConsumer<List<Object>>() {
 			@Override
-			public void apply(final List<Object> value) {
-				ISelection selection = comboViewer.getSelection();
+			public void apply(List<Object> value) {
 				if (!combo.isDisposed()) {
 					if (value != null) {
 						Object[] candidates = value.toArray();
@@ -268,16 +237,12 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager
 					} else {
 						comboViewer.setInput(null);
 					}
-					comboViewer.setSelection(selection, true);
 					if (!combo.isEnabled()) {
 						combo.setEnabled(true);
 					}
 				}
-
-				combo.setCursor(new Cursor(Display.getCurrent(), SWT.CURSOR_ARROW));
 			}
 		});
-
 	}
 
 	/**
@@ -291,7 +256,6 @@ public class EEFSelectLifecycleManager extends AbstractEEFWidgetLifecycleManager
 
 		if (!combo.isDisposed()) {
 			this.combo.removeSelectionListener(this.selectionListener);
-			this.combo.removeMouseListener(this.mouseListener);
 		}
 		this.controller.removeNewValueConsumer();
 		this.controller.removeNewCandidatesConsumer();