Target Explorer: undo new wizard change

1 files changed, 4 insertions, 10 deletions

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();
 				}
 			}
 		}