Attachment #128784 for bug #268602

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.TraverseEvent;
import org.eclipse.swt.events.TraverseListener;
import org.eclipse.swt.widgets.Composite;

            }
        });

        comboBox.addSelectionListener(new SelectionAdapter() {

            public void widgetDefaultSelected(SelectionEvent event) {
                // called when combo box or text field selected
                applyEditorValueAndDeactivate();
            }

            public void widgetSelected(SelectionEvent e) {
                // called when combo box selected
                widgetDefaultSelected(e);
            }
        });

         comboBox.addTraverseListener(new TraverseListener() {

            public void keyTraversed(TraverseEvent e) {

                }
            }
        });
         
         parent.addTraverseListener(new TraverseListener() {

             public void keyTraversed(TraverseEvent e) {
                 if (e.detail == SWT.TRAVERSE_ESCAPE
                         || e.detail == SWT.TRAVERSE_RETURN) {
                     e.doit = false;
                 }
                 if (e.detail == SWT.TRAVERSE_TAB_NEXT
                         || e.detail == SWT.TRAVERSE_TAB_PREVIOUS) {
                     e.doit = false;
                 }
             }
         });         

        if(emptyItem != null)
        	comboBox.setText(emptyItem);

Lines 20-25 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/MultiButtonCellEditor.java (+17 lines)
20	import org.eclipse.swt.events.KeyEvent;	20	import org.eclipse.swt.events.KeyEvent;
21	import org.eclipse.swt.events.SelectionAdapter;	21	import org.eclipse.swt.events.SelectionAdapter;
22	import org.eclipse.swt.events.SelectionEvent;	22	import org.eclipse.swt.events.SelectionEvent;
		23	import org.eclipse.swt.events.TraverseEvent;
		24	import org.eclipse.swt.events.TraverseListener;
23	import org.eclipse.swt.graphics.Color;	25	import org.eclipse.swt.graphics.Color;
24	import org.eclipse.swt.graphics.Font;	26	import org.eclipse.swt.graphics.Font;
25	import org.eclipse.swt.graphics.Point;	27	import org.eclipse.swt.graphics.Point;
Lines 267-272 Link Here
267	}	269	}
268	}	270	}
269	});	271	});
		272
		273	button.addTraverseListener(new TraverseListener() {
		274
		275	public void keyTraversed(TraverseEvent e) {
		276	if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS) {
		277	e.doit = false;
		278	getControl().traverse(SWT.TRAVERSE_TAB_PREVIOUS);
		279	}
		280
		281	if (e.detail == SWT.TRAVERSE_TAB_NEXT) {
		282	e.doit = false;
		283	getControl().traverse(SWT.TRAVERSE_TAB_NEXT);
		284	}
		285	}
		286	});
270		287
271	buttonList.add(button);	288	buttonList.add(button);
272	}	289	}

Return to bug 268602

Lines 21-28 Link Here

(-)src/org/eclipse/gmf/runtime/common/ui/services/properties/extended/ExtendedComboBoxCellEditor.java (-15 / +14 lines)
21	import org.eclipse.swt.custom.CCombo;	21	import org.eclipse.swt.custom.CCombo;
22	import org.eclipse.swt.events.KeyAdapter;	22	import org.eclipse.swt.events.KeyAdapter;
23	import org.eclipse.swt.events.KeyEvent;	23	import org.eclipse.swt.events.KeyEvent;
24	import org.eclipse.swt.events.SelectionAdapter;
25	import org.eclipse.swt.events.SelectionEvent;
26	import org.eclipse.swt.events.TraverseEvent;	24	import org.eclipse.swt.events.TraverseEvent;
27	import org.eclipse.swt.events.TraverseListener;	25	import org.eclipse.swt.events.TraverseListener;
28	import org.eclipse.swt.widgets.Composite;	26	import org.eclipse.swt.widgets.Composite;
Lines 191-209 Link Here
191	}	189	}
192	});	190	});
193		191
194	comboBox.addSelectionListener(new SelectionAdapter() {
195
196	public void widgetDefaultSelected(SelectionEvent event) {
197	// called when combo box or text field selected
198	applyEditorValueAndDeactivate();
199	}
200
201	public void widgetSelected(SelectionEvent e) {
202	// called when combo box selected
203	widgetDefaultSelected(e);
204	}
205	});
206
207	comboBox.addTraverseListener(new TraverseListener() {	192	comboBox.addTraverseListener(new TraverseListener() {
208		193
209	public void keyTraversed(TraverseEvent e) {	194	public void keyTraversed(TraverseEvent e) {
Lines 213-218 Link Here
213	}	198	}
214	}	199	}
215	});	200	});
		201
		202	parent.addTraverseListener(new TraverseListener() {
		203
		204	public void keyTraversed(TraverseEvent e) {
		205	if (e.detail == SWT.TRAVERSE_ESCAPE
		206	\|\| e.detail == SWT.TRAVERSE_RETURN) {
		207	e.doit = false;
		208	}
		209	if (e.detail == SWT.TRAVERSE_TAB_NEXT
		210	\|\| e.detail == SWT.TRAVERSE_TAB_PREVIOUS) {
		211	e.doit = false;
		212	}
		213	}
		214	});
216		215
217	if(emptyItem != null)	216	if(emptyItem != null)
218	comboBox.setText(emptyItem);	217	comboBox.setText(emptyItem);