Attachment #225535 for bug #385100

Lines 40-45 public class TracingComponentColumnEditingSupport extends EditingSupport { Link Here

(-)a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/TracingComponentColumnEditingSupport.java (-1 / +2 lines)
40	case TracingConstants.VALUE_COLUMN_INDEX :	40	case TracingConstants.VALUE_COLUMN_INDEX :
41	this.textEditor = new TextCellEditor((Composite) viewer.getControl(), SWT.NONE);	41	this.textEditor = new TextCellEditor((Composite) viewer.getControl(), SWT.NONE);
42	this.comboEditor = new ComboBoxCellEditor((Composite) viewer.getControl(), new String[] {Messages.TracingComponentColumnEditingSupport_true, Messages.TracingComponentColumnEditingSupport_false}, SWT.READ_ONLY \| SWT.SIMPLE);	42	this.comboEditor = new ComboBoxCellEditor((Composite) viewer.getControl(), new String[] {Messages.TracingComponentColumnEditingSupport_true, Messages.TracingComponentColumnEditingSupport_false}, SWT.READ_ONLY \| SWT.SIMPLE);
		43	this.comboEditor.setActivationStyle(ComboBoxCellEditor.DROP_DOWN_ON_KEY_ACTIVATION \| ComboBoxCellEditor.DROP_DOWN_ON_MOUSE_ACTIVATION);
43	break;	44	break;
44	default :	45	default :
45	// do nothing - no other columns provide editing support	46	// do nothing - no other columns provide editing support
Lines 138-143 public class TracingComponentColumnEditingSupport extends EditingSupport { Link Here
138	* The {@link CellEditor} for the value column	139	* The {@link CellEditor} for the value column
139	*/	140	*/
140	private CellEditor textEditor;	141	private CellEditor textEditor;
141	private CellEditor comboEditor;	142	private ComboBoxCellEditor comboEditor;
142		143
143	}	144	}




 *******************************************************************************/
package org.eclipse.ui.trace.internal;

import static org.eclipse.jface.viewers.ColumnViewerEditor.KEYBOARD_ACTIVATION;
import static org.eclipse.jface.viewers.ColumnViewerEditor.TABBING_HORIZONTAL;
import static org.eclipse.jface.viewers.ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR;
import static org.eclipse.jface.viewers.ColumnViewerEditor.TABBING_VERTICAL;
import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.KEY_PRESSED;
import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION;
import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.PROGRAMMATIC;
import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.TRAVERSAL;

import java.io.File;
import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.jface.layout.*;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.util.Util;
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;

 */
public class TracingPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {

	/**
	 * The key to activate the value cell editor.
	 * Cannot use the usual enter (CR) key to activate it since this would close the page.  Fix is to use
	 * the space key as replacement.
	 * On Linux, however, space is used as default key on ComboBoxes, leading to the editor being deactivated.
	 * We use F2 instead.
	 */
	private static final int VALUE_EDITOR_ACTIVATION_KEY = Util.isLinux() ? SWT.F2 : SWT.SPACE;

	/** A list of {@link TracingComponent} objects to display in the UI */
	private Map<String, TracingComponent> displayableTracingComponents = null;


		valueColumn.setLabelProvider(new TracingComponentColumnLabelProvider(TracingConstants.VALUE_COLUMN_INDEX));
		valueColumn.setEditingSupport(new TracingComponentColumnEditingSupport(getViewer(), TracingConstants.VALUE_COLUMN_INDEX));
		treeViewerCompositeLayout.setColumnData(getViewerTree().getColumn(1), new ColumnWeightData(25));

		// install focus cell and cell editor activation
		TreeViewerFocusCellManager focusCellManager = new TreeViewerFocusCellManager(getViewer(), new FocusCellOwnerDrawHighlighter(getViewer()));
		ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(getViewer()) {
			protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
				return (event.eventType == KEY_PRESSED && event.keyCode == VALUE_EDITOR_ACTIVATION_KEY) //
						|| event.eventType == TRAVERSAL //
						|| event.eventType == MOUSE_CLICK_SELECTION //
						|| event.eventType == PROGRAMMATIC;
			}
		};
		TreeViewerEditor.create(getViewer(), focusCellManager, actSupport, //
				TABBING_HORIZONTAL | TABBING_MOVE_TO_ROW_NEIGHBOR | TABBING_VERTICAL | KEYBOARD_ACTIVATION);
	}

	/**
- 

Return to bug 385100

Lines 10-21 Link Here

(-)a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/TracingPreferencePage.java (-1 / +32 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.trace.internal;	11	package org.eclipse.ui.trace.internal;
12		12
		13	import static org.eclipse.jface.viewers.ColumnViewerEditor.KEYBOARD_ACTIVATION;
		14	import static org.eclipse.jface.viewers.ColumnViewerEditor.TABBING_HORIZONTAL;
		15	import static org.eclipse.jface.viewers.ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR;
		16	import static org.eclipse.jface.viewers.ColumnViewerEditor.TABBING_VERTICAL;
		17	import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.KEY_PRESSED;
		18	import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION;
		19	import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.PROGRAMMATIC;
		20	import static org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent.TRAVERSAL;
		21
13	import java.io.File;	22	import java.io.File;
14	import java.util.*;	23	import java.util.*;
15	import org.eclipse.core.runtime.*;	24	import org.eclipse.core.runtime.*;
16	import org.eclipse.jface.layout.*;	25	import org.eclipse.jface.layout.*;
17	import org.eclipse.jface.preference.PreferencePage;	26	import org.eclipse.jface.preference.PreferencePage;
18	import org.eclipse.jface.resource.JFaceResources;	27	import org.eclipse.jface.resource.JFaceResources;
		28	import org.eclipse.jface.util.Util;
19	import org.eclipse.jface.viewers.*;	29	import org.eclipse.jface.viewers.*;
20	import org.eclipse.swt.SWT;	30	import org.eclipse.swt.SWT;
21	import org.eclipse.swt.events.SelectionAdapter;	31	import org.eclipse.swt.events.SelectionAdapter;
Lines 34-39 import org.eclipse.ui.trace.internal.utils.*; Link Here
34	*/	44	*/
35	public class TracingPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {	45	public class TracingPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
36		46
		47	/**
		48	* The key to activate the value cell editor.
		49	* Cannot use the usual enter (CR) key to activate it since this would close the page. Fix is to use
		50	* the space key as replacement.
		51	* On Linux, however, space is used as default key on ComboBoxes, leading to the editor being deactivated.
		52	* We use F2 instead.
		53	*/
		54	private static final int VALUE_EDITOR_ACTIVATION_KEY = Util.isLinux() ? SWT.F2 : SWT.SPACE;
		55
37	/** A list of {@link TracingComponent} objects to display in the UI */	56	/** A list of {@link TracingComponent} objects to display in the UI */
38	private Map<String, TracingComponent> displayableTracingComponents = null;	57	private Map<String, TracingComponent> displayableTracingComponents = null;
39		58
Lines 233-238 public class TracingPreferencePage extends PreferencePage implements IWorkbenchP Link Here
233	valueColumn.setLabelProvider(new TracingComponentColumnLabelProvider(TracingConstants.VALUE_COLUMN_INDEX));	252	valueColumn.setLabelProvider(new TracingComponentColumnLabelProvider(TracingConstants.VALUE_COLUMN_INDEX));
234	valueColumn.setEditingSupport(new TracingComponentColumnEditingSupport(getViewer(), TracingConstants.VALUE_COLUMN_INDEX));	253	valueColumn.setEditingSupport(new TracingComponentColumnEditingSupport(getViewer(), TracingConstants.VALUE_COLUMN_INDEX));
235	treeViewerCompositeLayout.setColumnData(getViewerTree().getColumn(1), new ColumnWeightData(25));	254	treeViewerCompositeLayout.setColumnData(getViewerTree().getColumn(1), new ColumnWeightData(25));
		255
		256	// install focus cell and cell editor activation
		257	TreeViewerFocusCellManager focusCellManager = new TreeViewerFocusCellManager(getViewer(), new FocusCellOwnerDrawHighlighter(getViewer()));
		258	ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(getViewer()) {
		259	protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
		260	return (event.eventType == KEY_PRESSED && event.keyCode == VALUE_EDITOR_ACTIVATION_KEY) //
		261	\|\| event.eventType == TRAVERSAL //
		262	\|\| event.eventType == MOUSE_CLICK_SELECTION //
		263	\|\| event.eventType == PROGRAMMATIC;
		264	}
		265	};
		266	TreeViewerEditor.create(getViewer(), focusCellManager, actSupport, //
		267	TABBING_HORIZONTAL \| TABBING_MOVE_TO_ROW_NEIGHBOR \| TABBING_VERTICAL \| KEYBOARD_ACTIVATION);
236	}	268	}
237		269
238	/**	270	/**
239	-