diff options
3 files changed, 17 insertions, 33 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DefaultContextSelectorToolbarContribution.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DefaultContextSelectorToolbarContribution.java index c578d3000..34a6f9b0b 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DefaultContextSelectorToolbarContribution.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/DefaultContextSelectorToolbarContribution.java @@ -23,7 +23,6 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ILabelProvider; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; @@ -61,6 +60,7 @@ import org.eclipse.tcf.te.ui.views.navigator.DelegatingLabelProvider; import org.eclipse.tcf.te.ui.wizards.newWizard.NewWizardRegistry; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.actions.NewWizardShortcutAction; import org.eclipse.ui.menus.IMenuService; import org.eclipse.ui.menus.IWorkbenchContribution; import org.eclipse.ui.menus.WorkbenchWindowControlContribution; @@ -70,6 +70,7 @@ import org.eclipse.ui.wizards.IWizardDescriptor; /** * Configurations control implementation. */ +@SuppressWarnings("restriction") public class DefaultContextSelectorToolbarContribution extends WorkbenchWindowControlContribution implements IWorkbenchContribution, IEventListener, IPeerModelListener { @@ -305,13 +306,7 @@ implements IWorkbenchContribution, IEventListener, IPeerModelListener { IWizardDescriptor wizardDesc = NewWizardRegistry.getInstance().findWizard(wizardIds[0]); if (wizardDesc == null) return; IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - try { - WizardDialog wd = new WizardDialog(window.getShell(), wizardDesc.createWizard()); - wd.setTitle(Messages.NewTargetWizard_windowTitle); - wd.open(); - } - catch (Exception e) { - } + new NewWizardShortcutAction(window, wizardDesc).run(); } else { TriggerCommandEvent event = new TriggerCommandEvent(this, "org.eclipse.tcf.te.ui.command.newWizards"); //$NON-NLS-1$ diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/NewToolbarCommandHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/NewToolbarCommandHandler.java index 5c1b7bc04..1cc87a0f2 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/NewToolbarCommandHandler.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/handler/NewToolbarCommandHandler.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.tcf.te.runtime.events.EventManager; import org.eclipse.tcf.te.runtime.events.TriggerCommandEvent; import org.eclipse.tcf.te.runtime.services.ServiceManager; @@ -25,15 +24,17 @@ import org.eclipse.tcf.te.runtime.services.interfaces.IUIService; import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel; import org.eclipse.tcf.te.tcf.locator.model.ModelManager; import org.eclipse.tcf.te.tcf.ui.interfaces.IDefaultContextToolbarDelegate; -import org.eclipse.tcf.te.tcf.ui.nls.Messages; import org.eclipse.tcf.te.ui.wizards.newWizard.NewWizardRegistry; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.internal.actions.NewWizardShortcutAction; import org.eclipse.ui.wizards.IWizardDescriptor; /** * NewToolbarCommandHandler */ +@SuppressWarnings("restriction") public class NewToolbarCommandHandler extends AbstractHandler { private String[] wizardIds; @@ -71,28 +72,22 @@ public class NewToolbarCommandHandler extends AbstractHandler { */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - openNewWizard(); + openNewWizard(event); return null; } - private void openNewWizard() { + private void openNewWizard(ExecutionEvent event) { init(); if (wizardIds.length == 1) { IWizardDescriptor wizardDesc = NewWizardRegistry.getInstance().findWizard(wizardIds[0]); if (wizardDesc == null) return; - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - - try { - WizardDialog wd = new WizardDialog(window.getShell(), wizardDesc.createWizard()); - wd.setTitle(Messages.NewTargetWizard_windowTitle); - wd.open(); - } - catch (Exception e) { - } + IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event); + if (window == null) window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + new NewWizardShortcutAction(window, wizardDesc).run(); } else { - TriggerCommandEvent event = new TriggerCommandEvent(this, "org.eclipse.tcf.te.ui.command.newWizards"); //$NON-NLS-1$ - EventManager.getInstance().fireEvent(event); + TriggerCommandEvent e = new TriggerCommandEvent(this, "org.eclipse.tcf.te.ui.command.newWizards"); //$NON-NLS-1$ + EventManager.getInstance().fireEvent(e); } } } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/NewWizardHandler.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/NewWizardHandler.java index 312ad3e1c..3087a3bd6 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/NewWizardHandler.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/handler/NewWizardHandler.java @@ -17,19 +17,19 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.tcf.te.ui.views.navigator.nodes.NewWizardNode; -import org.eclipse.tcf.te.ui.views.nls.Messages; import org.eclipse.tcf.te.ui.wizards.newWizard.NewWizardRegistry; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.internal.actions.NewWizardShortcutAction; import org.eclipse.ui.wizards.IWizardDescriptor; /** * New configuration wizard handler implementation. */ +@SuppressWarnings("restriction") public class NewWizardHandler extends AbstractHandler { /* (non-Javadoc) @@ -45,16 +45,10 @@ public class NewWizardHandler extends AbstractHandler { Object element = iterator.next(); if (element instanceof NewWizardNode) { IWizardDescriptor wizardDesc = NewWizardRegistry.getInstance().findWizard(((NewWizardNode)element).getWizardId()); - // In Eclipse 4.x, the HandlerUtil.getActiveWorkbenchWindow(event) may return null + if (wizardDesc == null) return null; IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event); if (window == null) window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - try { - WizardDialog wd = new WizardDialog(window.getShell(), wizardDesc.createWizard()); - wd.setTitle(Messages.NewWizardHandler_title); - wd.open(); - } - catch (Exception e) { - } + new NewWizardShortcutAction(window, wizardDesc).run(); } } } |