Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Spungin2014-07-13 11:02:29 -0400
committerSteven Spungin2014-07-13 11:02:29 -0400
commit1ab86356ce01b5628f666adb8705805378da71d1 (patch)
tree5c60228afa6eeac7cb3856620e56bd2ed7a9d946
parent775a2a12c1e7b0c2b95809b9d6ea06a90374cebe (diff)
downloadorg.eclipse.e4.tools-I20140713-2200.tar.gz
org.eclipse.e4.tools-I20140713-2200.tar.xz
org.eclipse.e4.tools-I20140713-2200.zip
Bug 439284 - [model editor] make list a combo with autocomplete for addI20140713-2200
part descriptor Change-Id: I894ebacf3c5058684933ae4895d448f03dfa8061 Signed-off-by: Steven Spungin <steven@spungin.tv>
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java111
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java19
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java6
3 files changed, 117 insertions, 19 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
new file mode 100644
index 00000000..5468385f
--- /dev/null
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/common/ComboViewerAutoComplete.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2014 TwelveTone LLC and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Steven Spungin <steven@spungin.tv> - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.e4.tools.emf.ui.common;
+
+import java.util.Arrays;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import org.eclipse.jface.fieldassist.ComboContentAdapter;
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.IContentProposal;
+import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Adds auto complete functionality to a combo viewer. It is assumed that the
+ * viewer is created with SWT.SIMPLE and SWT.READONLY flags. The proposals will
+ * be dynamically generated from the viewers current contents.
+ *
+ * @author Steven Spungin
+ *
+ */
+public class ComboViewerAutoComplete {
+
+ private ContentProposalAdapter adapter;
+
+ public ComboViewerAutoComplete(final ComboViewer dropDown) {
+ // use all items in the wrapped combo as proposals to filter instead of
+ // static String[]
+ SimpleContentProposalProvider proposalProvider = new SimpleContentProposalProvider(new String[0]) {
+ @Override
+ public IContentProposal[] getProposals(String contents, int position) {
+ String[] proposals = dropDown.getCombo().getItems();
+ setProposals(proposals);
+ return super.getProposals(contents, position);
+ }
+ };
+ // set the viewer instead of the wrapped combo
+ ComboContentAdapter contentAdapter = new ComboContentAdapter() {
+ @Override
+ public void setControlContents(Control control, String text1, int cursorPosition) {
+ super.setControlContents(control, text1, cursorPosition);
+ int index = Arrays.asList(dropDown.getCombo().getItems()).indexOf(text1);
+ Object object = dropDown.getElementAt(index);
+ dropDown.setSelection(new StructuredSelection(object));
+ }
+ };
+ proposalProvider.setFiltering(true);
+ adapter = new ContentProposalAdapter(dropDown.getCombo(), contentAdapter, proposalProvider, null, null);
+ adapter.setPropagateKeys(true);
+ adapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
+
+ // Focus the entire field after tab or click
+ dropDown.getCombo().addFocusListener(new FocusListener() {
+
+ private Object valueWhenFocused;
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ // Do not allow a null value (e.g. the user clicks with
+ // autocomplete text not set
+ Object object = (((IStructuredSelection) dropDown.getSelection())).getFirstElement();
+ if (object == null) {
+ dropDown.setSelection(new StructuredSelection(valueWhenFocused));
+ }
+ }
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ valueWhenFocused = (((IStructuredSelection) dropDown.getSelection())).getFirstElement();
+
+ // If the user clicks the text field (versus tab), the
+ // text will be unselected after we set the selection, so we
+ // need to delay the call
+ // THIS IS A WORKAROUND
+ final ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1);
+ executor.schedule(new Runnable() {
+ @Override
+ public void run() {
+ dropDown.getCombo().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ dropDown.getCombo().setSelection(new Point(0, dropDown.getCombo().getText().length()));
+ }
+ });
+ }
+ }, 200, TimeUnit.MILLISECONDS);
+ }
+ });
+ }
+
+ public boolean isProposalPopupOpen() {
+ return adapter.isProposalPopupOpen();
+ }
+
+}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
index b45b6f99..8abf07f2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/StringModelFragment.java
@@ -7,6 +7,7 @@
*
* Contributors:
* Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
+ * Steven Spungin <steve@spungin.tv> - Ongoing Maintenance
******************************************************************************/
package org.eclipse.e4.tools.emf.ui.internal.common.component;
@@ -237,24 +238,6 @@ public class StringModelFragment extends AbstractComponentEditor {
}
});
- tableElement.getDropDown().setContentProvider(new ArrayContentProvider());
- tableElement.getDropDown().setLabelProvider(new LabelProvider() {
- @Override
- public String getText(Object element) {
- FeatureClass eclass = (FeatureClass) element;
- return eclass.label;
- }
- });
-
- tableElement.getDropDown().setComparator(new ViewerComparator() {
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- FeatureClass eClass1 = (FeatureClass) e1;
- FeatureClass eClass2 = (FeatureClass) e2;
- return eClass1.label.compareTo(eClass2.label);
- }
- });
-
tableElement.getButtonAdd().addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
index 5b5a547f..b053d3d7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/ViewerElement.java
@@ -7,12 +7,14 @@
*
* Contributors:
* Wim Jongman <wim.jongman@remainsoftware.com> - initial API and implementation
+ * Steven Spungin <steve@spungin.tv> -Bug 439284 - [model editor] make list a combo with autocomplete for add part descriptor
******************************************************************************/
package org.eclipse.e4.tools.emf.ui.internal.common.uistructure;
import javax.inject.Inject;
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.ui.common.ComboViewerAutoComplete;
import org.eclipse.e4.tools.emf.ui.common.component.AbstractComponentEditor;
import org.eclipse.e4.tools.emf.ui.internal.Messages;
import org.eclipse.e4.tools.emf.ui.internal.ResourceProvider;
@@ -157,9 +159,11 @@ public class ViewerElement {
buttonCompTopLayout.marginHeight = 0;
buttonCompTop.setLayout(buttonCompTopLayout);
- dropDown = new ComboViewer(buttonCompTop);
+ dropDown = new ComboViewer(buttonCompTop, SWT.READ_ONLY | SWT.SIMPLE);
dropDown.getControl().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+ ComboViewerAutoComplete autocomplete = new ComboViewerAutoComplete(dropDown);
+
addButton = new Button(buttonCompTop, SWT.PUSH | SWT.FLAT);
addButton.setImage(editor.createImage(ResourceProvider.IMG_Obj16_table_add));
addButton.setText(Messages.ModelTooling_Common_AddEllipsis);

Back to the top