diff options
author | Tom Schindl | 2011-08-15 18:04:18 +0000 |
---|---|---|
committer | Tom Schindl | 2011-08-15 18:04:18 +0000 |
commit | c963b2293f11c216aeefd96651d6ce2f6e984ff8 (patch) | |
tree | 6fa7dcbe7b34a04cb399377ad823a6db645feab7 | |
parent | dbd8df1d3f2483f025b1609fc5a169c105502149 (diff) | |
download | org.eclipse.e4.tools-c963b2293f11c216aeefd96651d6ce2f6e984ff8.tar.gz org.eclipse.e4.tools-c963b2293f11c216aeefd96651d6ce2f6e984ff8.tar.xz org.eclipse.e4.tools-c963b2293f11c216aeefd96651d6ce2f6e984ff8.zip |
Bug 354053 - [Tooling] [E4XMI Editor Dialogs] Forward Arrow Keys fromv20110815-1804
Textbox to Listbox
6 files changed, 11 insertions, 46 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java index b0034d20..cc0c7086 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.e4.tools.emf.ui.common.IModelResource; import org.eclipse.e4.tools.emf.ui.internal.Messages; import org.eclipse.e4.tools.emf.ui.internal.PatternFilter; +import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory; import org.eclipse.e4.ui.model.application.commands.MCommand; import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl; import org.eclipse.emf.common.command.Command; @@ -37,8 +38,6 @@ import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -121,12 +120,7 @@ public abstract class AbstractCommandSelectionDialog extends TitleAreaDialog { }; viewer.addFilter(filter); - searchText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - filter.setPattern(((Text) e.widget).getText()); - viewer.refresh(); - } - }); + ControlFactory.attachFiltering(searchText, viewer, filter); return composite; } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java index bffd28ba..faadd680 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/BindingContextSelectionDialog.java @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.e4.tools.emf.ui.common.IModelResource; import org.eclipse.e4.tools.emf.ui.internal.Messages; import org.eclipse.e4.tools.emf.ui.internal.PatternFilter; +import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory; import org.eclipse.e4.ui.model.application.commands.MBindingContext; import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl; import org.eclipse.emf.common.util.TreeIterator; @@ -35,8 +36,6 @@ import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -118,12 +117,7 @@ public class BindingContextSelectionDialog extends TitleAreaDialog { }; viewer.addFilter(filter); - searchText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - filter.setPattern(((Text) e.widget).getText()); - viewer.refresh(); - } - }); + ControlFactory.attachFiltering(searchText, viewer, filter); return composite; } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java index 2df33903..cdb3a163 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java @@ -10,6 +10,8 @@ ******************************************************************************/ package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs; +import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory; + import java.util.ArrayList; import java.util.List; import org.eclipse.e4.tools.emf.ui.common.IModelResource; @@ -118,12 +120,7 @@ public class CommandCategorySelectionDialog extends TitleAreaDialog { }; viewer.addFilter(filter); - searchText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - filter.setPattern(((Text) e.widget).getText()); - viewer.refresh(); - } - }); + ControlFactory.attachFiltering(searchText, viewer, filter); return composite; } diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java index 12eaf294..7090bf33 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ExpressionIdDialog.java @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.e4.tools.emf.ui.common.IExtensionLookup; import org.eclipse.e4.tools.emf.ui.internal.Messages; import org.eclipse.e4.tools.emf.ui.internal.PatternFilter; +import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory; import org.eclipse.e4.ui.model.application.ui.MCoreExpression; import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl; import org.eclipse.emf.common.command.Command; @@ -35,8 +36,6 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -85,13 +84,8 @@ public class ExpressionIdDialog extends TitleAreaDialog { return viewer instanceof AbstractTreeViewer && super.isParentMatch(viewer, element); } }; - idField.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - filter.setPattern(((Text) e.widget).getText()); - viewer.refresh(); - } - }); + ControlFactory.attachFiltering(idField, viewer, filter); l = new Label(container, SWT.NONE); viewer = new TableViewer(container); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java index d0cfce38..bf39936e 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/FeatureSelectionDialog.java @@ -43,8 +43,6 @@ import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -132,12 +130,6 @@ public class FeatureSelectionDialog extends TitleAreaDialog { final ViewerFilterImpl filter = new ViewerFilterImpl(); viewer.addFilter(filter); - searchText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - filter.setPattern(searchText.getText()); - viewer.refresh(); - } - }); viewer.setInput(Util.loadPackages()); diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java index ce28f7fc..dd9c7af5 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/SharedElementsDialog.java @@ -17,6 +17,7 @@ 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.PatternFilter; import org.eclipse.e4.tools.emf.ui.internal.common.ModelEditor; +import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.MApplicationElement; import org.eclipse.e4.ui.model.application.ui.MUIElement; @@ -45,8 +46,6 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -129,12 +128,7 @@ public class SharedElementsDialog extends TitleAreaDialog { }; viewer.addFilter(filter); - searchText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - filter.setPattern(((Text) e.widget).getText()); - viewer.refresh(); - } - }); + ControlFactory.attachFiltering(searchText, viewer, filter); return comp; } |