Description Rob Stryker 2008-09-03 17:10:33 EDT

In the new Server Wizard, adding a new runtime (which opens the runtime wizard) should automatically select the new runtime.  Patch pasted below:

### Eclipse Workspace Patch 1.0
#P org.eclipse.wst.server.ui
Index: serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
===================================================================
RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java,v
retrieving revision 1.41
diff -u -r1.41 NewManualServerComposite.java
--- serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java	21 Jul 2008 14:50:08 -0000	1.41
+++ serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java	3 Sep 2008 21:09:09 -0000
@@ -234,8 +234,7 @@
 		addRuntime.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				IServerType serverType = serverTypeComposite.getSelectedServerType();
-				if (showRuntimeWizard(serverType) != Window.CANCEL)
-					updateRuntimeCombo(serverType);
+				showRuntimeWizard(serverType);
 			}
 		});
 		
@@ -263,20 +262,20 @@
 		return (dialog.open() == Window.OK);
 	}
 
-	protected int showRuntimeWizard(IServerType serverType) {
+	protected void showRuntimeWizard(IServerType serverType) {
 		WizardFragment fragment = null;
 		TaskModel taskModel = new TaskModel();
 		IRuntimeType runtimeType = serverType.getRuntimeType();
 		final WizardFragment fragment2 = ServerUIPlugin.getWizardFragment(runtimeType.getId());
 		if (fragment2 == null)
-			return Window.CANCEL;
+			return;
 		
 		try {
 			IRuntimeWorkingCopy runtimeWorkingCopy = runtimeType.createRuntime(null, null);
 			taskModel.putObject(TaskModel.TASK_RUNTIME, runtimeWorkingCopy);
 		} catch (CoreException ce) {
 			Trace.trace(Trace.SEVERE, "Error creating runtime", ce);
-			return Window.CANCEL;
+			return;
 		}
 		fragment = new WizardFragment() {
 			protected void createChildFragments(List<WizardFragment> list) {
@@ -287,7 +286,13 @@
 		TaskWizard wizard2 = new TaskWizard(Messages.wizNewRuntimeWizardTitle, fragment, taskModel);
 		wizard2.setForcePreviousAndNextButtons(true);
 		WizardDialog dialog = new WizardDialog(getShell(), wizard2);
-		return dialog.open();
+		if( dialog.open() != Window.CANCEL ) {
+			updateRuntimeCombo(serverType);
+			IRuntime rt = (IRuntime)taskModel.getObject(TaskModel.TASK_RUNTIME);
+			if( rt != null && rt.getName() != null && runtimeCombo.indexOf(rt.getName()) != -1) {
+				runtimeCombo.select(runtimeCombo.indexOf(rt.getName()));
+			}
+		}
 	}
 
 	public void setHost(String host) {