diff options
author | Lars Vogel | 2018-11-13 08:46:04 +0000 |
---|---|---|
committer | Lars Vogel | 2018-11-16 09:58:50 +0000 |
commit | f2349deb48a9a55ae782c0c4e5fea31200606cea (patch) | |
tree | 02641fdfb5128144a769cf0fe8ef5808ba4d6217 | |
parent | 1541ba8503cba652ebe6230dcddab19a9555d4cd (diff) | |
download | eclipse.platform.ui.tools-Y20181128-2200.tar.gz eclipse.platform.ui.tools-Y20181128-2200.tar.xz eclipse.platform.ui.tools-Y20181128-2200.zip |
Minor cleanup in AbstractPickListY20181205-2200Y20181204-0315Y20181128-2200Y20181121-2200S4_10_0_RC2S4_10_0_RC1S4_10_0_M3R4_10I20181206-0815I20181206-0320I20181206-0225I20181206-0030I20181205-1800I20181205-0600I20181204-1800I20181204-0600I20181203-1800I20181203-0600I20181202-1800I20181202-0600I20181201-1800I20181201-0600I20181130-1800I20181129-0330I20181128-1800I20181128-1105I20181128-0810I20181128-0600I20181128-0130I20181127-1800I20181127-0600I20181126-1800I20181126-0940I20181126-0600I20181126-0140I20181125-1800I20181125-0600I20181124-1800I20181124-0600I20181123-1800I20181121-1800I20181121-0910I20181121-0600I20181120-1800I20181120-0600I20181119-2315I20181119-1800I20181119-0600I20181118-1800I20181118-0600I20181117-1800I20181117-0600I20181116-1800R4_10_maintenance
Removes commented code
Fixes a few sonar issues
Change-Id: Ieb82a66656ae464c033a03b8e35751413ef6a391
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r-- | bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java index cf6b2c08..894e012f 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/AbstractPickList.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2017 TwelveTone LLC and others. + * Copyright (c) 2014, 2018 TwelveTone LLC and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -46,12 +46,10 @@ import org.eclipse.swt.widgets.Table; * selectable items, and action buttons for modifying the list. * </p> * - * @author Steven Spungin - * */ public abstract class AbstractPickList extends Composite { - public static enum PickListFeatures { + public enum PickListFeatures { NO_ORDER, NO_PICKER, NO_GROUP } @@ -65,7 +63,6 @@ public abstract class AbstractPickList extends Composite { protected final Button tiRemove; protected final Button tiUp; protected final Button tiDown; - // private final AutoCompleteField autoCompleteField; @Deprecated public AbstractPickList(Composite parent, int style, List<PickListFeatures> listFeatures, Messages messages, @@ -117,21 +114,6 @@ public abstract class AbstractPickList extends Composite { gdpicker.grabExcessHorizontalSpace = true; control.setLayoutData(gdpicker); - // ComboContentAdapter controlContentAdapter = new ComboContentAdapter() - // { - // @Override - // public void setControlContents(Control control, String text1, int - // cursorPosition) { - // super.setControlContents(control, text1, cursorPosition); - // Object valueInModel = proposals.get(text1); - // if (valueInModel != null) { - // getPicker().setSelection(new StructuredSelection(valueInModel)); - // } - // } - // }; - // autoCompleteField = new AutoCompleteField(control, - // controlContentAdapter, new String[0]); - toolBar = new Composite(comp, SWT.NONE); layout = new GridLayout(5, true); if (listFeatures != null && listFeatures.contains(PickListFeatures.NO_PICKER)) { @@ -238,7 +220,7 @@ public abstract class AbstractPickList extends Composite { protected void addPressed() { } - abstract protected int getItemCount(); + protected abstract int getItemCount(); public TableViewer getList() { return viewer; @@ -247,9 +229,6 @@ public abstract class AbstractPickList extends Composite { public void setInput(Object input) { getPicker().setInput(input); - // proposals = toProposals(input); - // final Set<String> keySet = proposals.keySet(); - // autoCompleteField.setProposals(keySet.toArray(new String[keySet.size()])); } public IStructuredSelection getSelection() { |