Attachment #64658 for bug #183679

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




import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.resource.DeviceResourceException;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;

		if (window == null) {
			return null;
		}
		
		if (providers == null) {
			providers = new AbstractProvider[] { new PreviousPicksProvider(),
					new EditorProvider(), new ViewProvider(),
					new PerspectiveProvider(), new CommandProvider(),
					new ActionProvider(), new WizardProvider(),
					new PreferenceProvider(), new PropertiesProvider() };
			
			providerMap = new HashMap();
			for (int i = 0; i < providers.length; i++) {
				providerMap.put(providers[i].getId(), providers[i]);
			}
		}
		
		PopupDialog popupDialog = new QuickAccessDialog(window.getShell(), providers);
		popupDialog.open();
		if(true) return null;

		FilteringInfoPopup popup = new QuickAccessPopup(ProgressManagerUtil
				.getDefaultParent(), providers);

Lines 11-16 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/incubator/AbstractElement.java (+25 lines)
11		11
12	package org.eclipse.ui.internal.incubator;	12	package org.eclipse.ui.internal.incubator;
13		13
		14	import java.util.StringTokenizer;
		15
14	import org.eclipse.jface.resource.ImageDescriptor;	16	import org.eclipse.jface.resource.ImageDescriptor;
15		17
16	/**	18	/**
Lines 30-35 Link Here
30	}	32	}
31		33
32	/**	34	/**
		35	* @return a string containing the first character of every word for
		36	* camel case checking.
		37	*/
		38	private static String getCamelCase(String label) {
		39	StringTokenizer tokenizer = new StringTokenizer(label);
		40	StringBuffer camelCase = new StringBuffer();
		41	while(tokenizer.hasMoreTokens()) {
		42	String word = tokenizer.nextToken();
		43	camelCase.append(word.charAt(0));
		44	}
		45	return camelCase.toString();
		46	}
		47
		48	final String[] getMatchLabels() {
		49	String sortLabel = getSortLabel();
		50	String camelCase = getCamelCase(sortLabel);
		51	String combinedLabel = provider.getName()
		52	+ " " + getLabel(); //$NON-NLS-1$
		53	String combinedCamelCase = getCamelCase(combinedLabel);
		54	return (new String[] { sortLabel, camelCase, combinedLabel, combinedCamelCase });
		55	}
		56
		57	/**
33	* Returns the label to be displayed to the user.	58	* Returns the label to be displayed to the user.
34	*	59	*
35	* @return the label	60	* @return the label




package org.eclipse.ui.internal.incubator;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.resource.DeviceResourceException;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.resource.LocalResourceManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
import org.eclipse.ui.internal.WorkbenchImages;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.misc.StringMatcher;

/**
 * @since 3.3
 * 
 */
public class QuickAccessDialog extends PopupDialog {
	private static final int MAX_COUNT_PER_PROVIDER = 5;
	private static final int MAX_COUNT_TOTAL = 20;
	private Text filterText;
	private AbstractProvider[] providers;
	private Table table;
	private LocalResourceManager resourceManager = new LocalResourceManager(
			JFaceResources.getResources());

	/**
	 * @param parent
	 * @param providers
	 */
	QuickAccessDialog(Shell parent, AbstractProvider[] providers) {
		super(parent, SWT.RESIZE, true, true, true, true, "Foo", "foo"); //$NON-NLS-1$ //$NON-NLS-2$
		this.providers = providers;
	}

	protected Control createTitleControl(Composite parent) {
		filterText = new Text(parent, SWT.NONE);

		GC gc = new GC(parent);
		gc.setFont(parent.getFont());
		FontMetrics fontMetrics = gc.getFontMetrics();
		gc.dispose();

		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true,
				false).hint(SWT.DEFAULT,
				Dialog.convertHeightInCharsToPixels(fontMetrics, 1)).applyTo(
				filterText);

		filterText.addKeyListener(new KeyListener() {
			public void keyPressed(KeyEvent e) {
				if (e.keyCode == 0x0D) {
					// return
					// Object selectedElement = getSelectedElement();
					close();
					// handleElementSelected(selectedElement);
				}
				if (e.keyCode == SWT.ARROW_DOWN)
					table.setFocus();
				if (e.keyCode == SWT.ARROW_UP)
					table.setFocus();
				if (e.character == 0x1B) // ESC
					close();
			}

			public void keyReleased(KeyEvent e) {
				// do nothing
			}
		});
		filterText.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				String text = ((Text) e.widget).getText();
				int length = text.length();
				if (length > 0) {
					if (text.charAt(length - 1) != '*') {
						text = text + '*';
					}
					if (text.charAt(0) != '*') {
						text = '*' + text;
					}
				}
				refreshTable(text);
			}
		});

		return filterText;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.PopupDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createDialogArea(Composite parent) {
		Composite composite = (Composite) super.createDialogArea(parent);
		table = new Table(composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL
				| SWT.BORDER | SWT.FULL_SELECTION);
		new TableColumn(table, SWT.NONE).setWidth(100);
		new TableColumn(table, SWT.NONE).setWidth(300);
		GridDataFactory.fillDefaults().grab(true, true).applyTo(table);
		// table.addListener(SWT.MeasureItem, new Listener() {
		// public void handleEvent(Event event) {
		// TableEntry entry = (TableEntry) event.item.getData();
		// }
		// });
		//TextLayout layout = new TextLayout(table.getDisplay());
		Listener listener = new Listener() {
			public void handleEvent(Event event) {
				switch (event.type) {
				case SWT.MeasureItem:
					break;
				case SWT.PaintItem:
					break;
				case SWT.EraseItem:
					Rectangle bounds = event.getBounds();
					if ((event.detail & SWT.SELECTED) != 0) {
						Color oldForeground = event.gc.getForeground();
						Color oldBackground = event.gc.getBackground();

						event.gc.setBackground(event.item.getDisplay()
								.getSystemColor(SWT.COLOR_LIST_SELECTION));
						event.gc.setForeground(event.item.getDisplay()
								.getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT));
						event.gc.fillRectangle(bounds);
						/* restore the old GC colors */
						event.gc.setForeground(oldForeground);
						event.gc.setBackground(oldBackground);
						/* ensure that default selection is not drawn */
						event.detail &= ~SWT.SELECTED;
					}
					break;
				}
			}
		};
		table.addListener(SWT.MeasureItem, listener);
		table.addListener(SWT.EraseItem, listener);
		table.addListener(SWT.PaintItem, listener);
		refreshTable();
		return composite;
	}

	private static class TableEntry {
		boolean firstInCategory;
		AbstractElement element;

		TableEntry(boolean firstInCategory, AbstractElement element) {
			this.firstInCategory = firstInCategory;
			this.element = element;
		}
	}

	/**
	 * 
	 */
	private void refreshTable() {
		String filter = filterText.getText();
		refreshTable(filter);
	}

	/**
	 * 
	 */
	private void refreshTable(String filter) {
		table.setRedraw(false);
		try {
			TableItem[] items = table.getItems();
			StringMatcher stringMatcher = new StringMatcher(filter, true, false);
			int countTotal = 0;
			for (int i = 0; i < providers.length
					&& countTotal < MAX_COUNT_TOTAL; i++) {
				int countPerProvider = 0;
				AbstractProvider provider = providers[i];
				AbstractElement[] elements = provider.getElements();
				element_loop: for (int j = 0; j < elements.length
						&& countPerProvider < MAX_COUNT_PER_PROVIDER
						&& countTotal < MAX_COUNT_TOTAL; j++) {
					AbstractElement element = elements[j];
					String[] matchLabels = element.getMatchLabels();
					for (int k = 0; k < matchLabels.length; k++) {
						if (stringMatcher.match(matchLabels[k])) {
							boolean firstInCategory = countPerProvider == 0;
							TableEntry entry = new TableEntry(firstInCategory,
									element);
							TableItem item;
							if (countTotal < items.length) {
								item = items[countTotal];
							} else {
								item = new TableItem(table, SWT.NONE);
							}
							item.setData(entry);
							if (firstInCategory) {
								item
										.setText(0, element.getProvider()
												.getName());
							}
							item.setText(1, element.getLabel());
							item.setImage(1, getImage(element));
							countPerProvider++;
							countTotal++;
							continue element_loop;
						}
					}
				}
			}
			for (int i = countTotal; i < items.length; i++) {
				items[i].dispose();
			}
			if (countTotal > 0) {
				table.setSelection(0);
			} else {
				table.deselectAll();
			}
		} finally {
			table.setRedraw(true);
		}
	}

	private Image getImage(AbstractElement element) {
		Image image = findOrCreateImage(((AbstractElement) element)
				.getImageDescriptor());
		if (image == null) {
			image = WorkbenchImages
					.getImage(IWorkbenchGraphicConstants.IMG_OBJ_ELEMENT);
		}
		return image;
	}

	private Image findOrCreateImage(ImageDescriptor imageDescriptor) {
		if (imageDescriptor == null) {
			return null;
		}
		Image image = (Image) resourceManager.find(imageDescriptor);
		if (image == null) {
			try {
				image = resourceManager.createImage(imageDescriptor);
			} catch (DeviceResourceException e) {
				WorkbenchPlugin.log(e);
			}
		}
		return image;
	}

	protected Control getFocusControl() {
		return filterText;
	}

	public boolean close() {
		if (resourceManager != null) {
			resourceManager.dispose();
			resourceManager = null;
		}
		return super.close();
	}
}

Return to bug 183679

Lines 20-25 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/incubator/CtrlEAction.java (-2 / +7 lines)
20	import org.eclipse.core.commands.ExecutionEvent;	20	import org.eclipse.core.commands.ExecutionEvent;
21	import org.eclipse.core.runtime.Assert;	21	import org.eclipse.core.runtime.Assert;
22	import org.eclipse.jface.dialogs.IDialogSettings;	22	import org.eclipse.jface.dialogs.IDialogSettings;
		23	import org.eclipse.jface.dialogs.PopupDialog;
23	import org.eclipse.jface.resource.DeviceResourceException;	24	import org.eclipse.jface.resource.DeviceResourceException;
24	import org.eclipse.jface.resource.ImageDescriptor;	25	import org.eclipse.jface.resource.ImageDescriptor;
25	import org.eclipse.jface.resource.JFaceResources;	26	import org.eclipse.jface.resource.JFaceResources;
Lines 83-101 Link Here
83	if (window == null) {	84	if (window == null) {
84	return null;	85	return null;
85	}	86	}
86		87
87	if (providers == null) {	88	if (providers == null) {
88	providers = new AbstractProvider[] { new PreviousPicksProvider(),	89	providers = new AbstractProvider[] { new PreviousPicksProvider(),
89	new EditorProvider(), new ViewProvider(),	90	new EditorProvider(), new ViewProvider(),
90	new PerspectiveProvider(), new CommandProvider(),	91	new PerspectiveProvider(), new CommandProvider(),
91	new ActionProvider(), new WizardProvider(),	92	new ActionProvider(), new WizardProvider(),
92	new PreferenceProvider(), new PropertiesProvider() };	93	new PreferenceProvider(), new PropertiesProvider() };
93		94
94	providerMap = new HashMap();	95	providerMap = new HashMap();
95	for (int i = 0; i < providers.length; i++) {	96	for (int i = 0; i < providers.length; i++) {
96	providerMap.put(providers[i].getId(), providers[i]);	97	providerMap.put(providers[i].getId(), providers[i]);
97	}	98	}
98	}	99	}
		100
		101	PopupDialog popupDialog = new QuickAccessDialog(window.getShell(), providers);
		102	popupDialog.open();
		103	if(true) return null;
99		104
100	FilteringInfoPopup popup = new QuickAccessPopup(ProgressManagerUtil	105	FilteringInfoPopup popup = new QuickAccessPopup(ProgressManagerUtil
101	.getDefaultParent(), providers);	106	.getDefaultParent(), providers);

Added Link Here

(-)Eclipse (+273 lines)
1	package org.eclipse.ui.internal.incubator;
2
3	import org.eclipse.jface.dialogs.Dialog;
4	import org.eclipse.jface.dialogs.PopupDialog;
5	import org.eclipse.jface.layout.GridDataFactory;
6	import org.eclipse.jface.resource.DeviceResourceException;
7	import org.eclipse.jface.resource.ImageDescriptor;
8	import org.eclipse.jface.resource.JFaceResources;
9	import org.eclipse.jface.resource.LocalResourceManager;
10	import org.eclipse.swt.SWT;
11	import org.eclipse.swt.events.KeyEvent;
12	import org.eclipse.swt.events.KeyListener;
13	import org.eclipse.swt.events.ModifyEvent;
14	import org.eclipse.swt.events.ModifyListener;
15	import org.eclipse.swt.graphics.Color;
16	import org.eclipse.swt.graphics.FontMetrics;
17	import org.eclipse.swt.graphics.GC;
18	import org.eclipse.swt.graphics.Image;
19	import org.eclipse.swt.graphics.Rectangle;
20	import org.eclipse.swt.widgets.Composite;
21	import org.eclipse.swt.widgets.Control;
22	import org.eclipse.swt.widgets.Event;
23	import org.eclipse.swt.widgets.Listener;
24	import org.eclipse.swt.widgets.Shell;
25	import org.eclipse.swt.widgets.Table;
26	import org.eclipse.swt.widgets.TableColumn;
27	import org.eclipse.swt.widgets.TableItem;
28	import org.eclipse.swt.widgets.Text;
29	import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
30	import org.eclipse.ui.internal.WorkbenchImages;
31	import org.eclipse.ui.internal.WorkbenchPlugin;
32	import org.eclipse.ui.internal.misc.StringMatcher;
33
34	/**
35	* @since 3.3
36	*
37	*/
38	public class QuickAccessDialog extends PopupDialog {
39	private static final int MAX_COUNT_PER_PROVIDER = 5;
40	private static final int MAX_COUNT_TOTAL = 20;
41	private Text filterText;
42	private AbstractProvider[] providers;
43	private Table table;
44	private LocalResourceManager resourceManager = new LocalResourceManager(
45	JFaceResources.getResources());
46
47	/**
48	* @param parent
49	* @param providers
50	*/
51	QuickAccessDialog(Shell parent, AbstractProvider[] providers) {
52	super(parent, SWT.RESIZE, true, true, true, true, "Foo", "foo"); //$NON-NLS-1$ //$NON-NLS-2$
53	this.providers = providers;
54	}
55
56	protected Control createTitleControl(Composite parent) {
57	filterText = new Text(parent, SWT.NONE);
58
59	GC gc = new GC(parent);
60	gc.setFont(parent.getFont());
61	FontMetrics fontMetrics = gc.getFontMetrics();
62	gc.dispose();
63
64	GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true,
65	false).hint(SWT.DEFAULT,
66	Dialog.convertHeightInCharsToPixels(fontMetrics, 1)).applyTo(
67	filterText);
68
69	filterText.addKeyListener(new KeyListener() {
70	public void keyPressed(KeyEvent e) {
71	if (e.keyCode == 0x0D) {
72	// return
73	// Object selectedElement = getSelectedElement();
74	close();
75	// handleElementSelected(selectedElement);
76	}
77	if (e.keyCode == SWT.ARROW_DOWN)
78	table.setFocus();
79	if (e.keyCode == SWT.ARROW_UP)
80	table.setFocus();
81	if (e.character == 0x1B) // ESC
82	close();
83	}
84
85	public void keyReleased(KeyEvent e) {
86	// do nothing
87	}
88	});
89	filterText.addModifyListener(new ModifyListener() {
90	public void modifyText(ModifyEvent e) {
91	String text = ((Text) e.widget).getText();
92	int length = text.length();
93	if (length > 0) {
94	if (text.charAt(length - 1) != '*') {
95	text = text + '*';
96	}
97	if (text.charAt(0) != '*') {
98	text = '*' + text;
99	}
100	}
101	refreshTable(text);
102	}
103	});
104
105	return filterText;
106	}
107
108	/*
109	* (non-Javadoc)
110	*
111	* @see org.eclipse.jface.dialogs.PopupDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
112	*/
113	protected Control createDialogArea(Composite parent) {
114	Composite composite = (Composite) super.createDialogArea(parent);
115	table = new Table(composite, SWT.SINGLE \| SWT.H_SCROLL \| SWT.V_SCROLL
116	\| SWT.BORDER \| SWT.FULL_SELECTION);
117	new TableColumn(table, SWT.NONE).setWidth(100);
118	new TableColumn(table, SWT.NONE).setWidth(300);
119	GridDataFactory.fillDefaults().grab(true, true).applyTo(table);
120	// table.addListener(SWT.MeasureItem, new Listener() {
121	// public void handleEvent(Event event) {
122	// TableEntry entry = (TableEntry) event.item.getData();
123	// }
124	// });
125	//TextLayout layout = new TextLayout(table.getDisplay());
126	Listener listener = new Listener() {
127	public void handleEvent(Event event) {
128	switch (event.type) {
129	case SWT.MeasureItem:
130	break;
131	case SWT.PaintItem:
132	break;
133	case SWT.EraseItem:
134	Rectangle bounds = event.getBounds();
135	if ((event.detail & SWT.SELECTED) != 0) {
136	Color oldForeground = event.gc.getForeground();
137	Color oldBackground = event.gc.getBackground();
138
139	event.gc.setBackground(event.item.getDisplay()
140	.getSystemColor(SWT.COLOR_LIST_SELECTION));
141	event.gc.setForeground(event.item.getDisplay()
142	.getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT));
143	event.gc.fillRectangle(bounds);
144	/* restore the old GC colors */
145	event.gc.setForeground(oldForeground);
146	event.gc.setBackground(oldBackground);
147	/* ensure that default selection is not drawn */
148	event.detail &= ~SWT.SELECTED;
149	}
150	break;
151	}
152	}
153	};
154	table.addListener(SWT.MeasureItem, listener);
155	table.addListener(SWT.EraseItem, listener);
156	table.addListener(SWT.PaintItem, listener);
157	refreshTable();
158	return composite;
159	}
160
161	private static class TableEntry {
162	boolean firstInCategory;
163	AbstractElement element;
164
165	TableEntry(boolean firstInCategory, AbstractElement element) {
166	this.firstInCategory = firstInCategory;
167	this.element = element;
168	}
169	}
170
171	/**
172	*
173	*/
174	private void refreshTable() {
175	String filter = filterText.getText();
176	refreshTable(filter);
177	}
178
179	/**
180	*
181	*/
182	private void refreshTable(String filter) {
183	table.setRedraw(false);
184	try {
185	TableItem[] items = table.getItems();
186	StringMatcher stringMatcher = new StringMatcher(filter, true, false);
187	int countTotal = 0;
188	for (int i = 0; i < providers.length
189	&& countTotal < MAX_COUNT_TOTAL; i++) {
190	int countPerProvider = 0;
191	AbstractProvider provider = providers[i];
192	AbstractElement[] elements = provider.getElements();
193	element_loop: for (int j = 0; j < elements.length
194	&& countPerProvider < MAX_COUNT_PER_PROVIDER
195	&& countTotal < MAX_COUNT_TOTAL; j++) {
196	AbstractElement element = elements[j];
197	String[] matchLabels = element.getMatchLabels();
198	for (int k = 0; k < matchLabels.length; k++) {
199	if (stringMatcher.match(matchLabels[k])) {
200	boolean firstInCategory = countPerProvider == 0;
201	TableEntry entry = new TableEntry(firstInCategory,
202	element);
203	TableItem item;
204	if (countTotal < items.length) {
205	item = items[countTotal];
206	} else {
207	item = new TableItem(table, SWT.NONE);
208	}
209	item.setData(entry);
210	if (firstInCategory) {
211	item
212	.setText(0, element.getProvider()
213	.getName());
214	}
215	item.setText(1, element.getLabel());
216	item.setImage(1, getImage(element));
217	countPerProvider++;
218	countTotal++;
219	continue element_loop;
220	}
221	}
222	}
223	}
224	for (int i = countTotal; i < items.length; i++) {
225	items[i].dispose();
226	}
227	if (countTotal > 0) {
228	table.setSelection(0);
229	} else {
230	table.deselectAll();
231	}
232	} finally {
233	table.setRedraw(true);
234	}
235	}
236
237	private Image getImage(AbstractElement element) {
238	Image image = findOrCreateImage(((AbstractElement) element)
239	.getImageDescriptor());
240	if (image == null) {
241	image = WorkbenchImages
242	.getImage(IWorkbenchGraphicConstants.IMG_OBJ_ELEMENT);
243	}
244	return image;
245	}
246
247	private Image findOrCreateImage(ImageDescriptor imageDescriptor) {
248	if (imageDescriptor == null) {
249	return null;
250	}
251	Image image = (Image) resourceManager.find(imageDescriptor);
252	if (image == null) {
253	try {
254	image = resourceManager.createImage(imageDescriptor);
255	} catch (DeviceResourceException e) {
256	WorkbenchPlugin.log(e);
257	}
258	}
259	return image;
260	}
261
262	protected Control getFocusControl() {
263	return filterText;
264	}
265
266	public boolean close() {
267	if (resourceManager != null) {
268	resourceManager.dispose();
269	resourceManager = null;
270	}
271	return super.close();
272	}
273	}