Attachment 153379 Details for Bug 291120 – Supports the new flow of the new server wizard flow

Supports the new flow of the new server wizard flow

supportForNewServerWizardFlow.txt (text/plain), 7.78 KB, created by Sheldon Wosnick

on 2009-11-30 14:18:43 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Sheldon Wosnick

Created: 2009-11-30 14:18:43 EST

Size: 7.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.server.ui
>Index: serverui/org/eclipse/wst/server/ui/internal/Messages.properties
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties,v
>retrieving revision 1.93
>diff -u -r1.93 Messages.properties
>--- serverui/org/eclipse/wst/server/ui/internal/Messages.properties	10 Dec 2008 21:20:07 -0000	1.93
>+++ serverui/org/eclipse/wst/server/ui/internal/Messages.properties	30 Nov 2009 19:08:16 -0000
>@@ -21,6 +21,7 @@
> wizNewServerRunOnServerDescription=Select which server to use
> wizNewServerRuntime=Server &runtime environment:
> wizNewServerRuntimeCreate=Create a new runtime environment
>+wizCheckRemoteSupport=The selected server type does not support remote hosts
> 
> wizNewServerSelect=How do you want to select the server?
> wizNewServerExisting=Choose an e&xisting server
>Index: serverui/org/eclipse/wst/server/ui/internal/Messages.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java,v
>retrieving revision 1.65
>diff -u -r1.65 Messages.java
>--- serverui/org/eclipse/wst/server/ui/internal/Messages.java	10 Dec 2008 20:06:39 -0000	1.65
>+++ serverui/org/eclipse/wst/server/ui/internal/Messages.java	30 Nov 2009 19:08:15 -0000
>@@ -213,6 +213,8 @@
> 	public static String wizNewServerWizardTitle;
> 	public static String wizSelectClientWizardTitle;
> 	public static String wizTaskWizardTitle;
>+	public static String wizCheckRemoteSupport;
>+
> 	public static String dialogMonitorTitle;
> 	public static String dialogMonitorMonitorPort;
> 	public static String dialogMonitorColumnStatus;
>Index: serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java,v
>retrieving revision 1.25
>diff -u -r1.25 NewServerWizardFragment.java
>--- serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java	17 Sep 2007 13:17:17 -0000	1.25
>+++ serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewServerWizardFragment.java	30 Nov 2009 19:08:16 -0000
>@@ -20,8 +20,10 @@
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.wst.server.core.*;
> import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
>+import org.eclipse.wst.server.core.util.SocketUtil;
> import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
> import org.eclipse.wst.server.ui.internal.wizard.WizardTaskUtil;
>+import org.eclipse.wst.server.ui.internal.wizard.page.NewManualServerComposite;
> import org.eclipse.wst.server.ui.internal.wizard.page.NewServerComposite;
> import org.eclipse.wst.server.ui.wizard.WizardFragment;
> import org.eclipse.wst.server.ui.wizard.IWizardHandle;
>@@ -39,6 +41,8 @@
> 
> 	protected Map<String, WizardFragment> fragmentMap = new HashMap<String, WizardFragment>();
> 	protected IPath runtimeLocation = null;
>+	protected NewServerComposite comp;
>+
> 
> 	public NewServerWizardFragment() {
> 		// do nothing
>@@ -66,7 +70,7 @@
> 	 */
> 	public Composite createComposite(Composite parent, IWizardHandle wizard) {
> 		String launchMode = (String) getTaskModel().getObject(TaskModel.TASK_LAUNCH_MODE);
>-		NewServerComposite comp = null;
>+		
> 		if (moduleType != null || serverTypeId != null)
> 			comp = new NewServerComposite(parent, wizard, moduleType, serverTypeId, launchMode);
> 		else
>@@ -139,9 +143,39 @@
> 	}
> 
> 	public boolean isComplete() {
>-		return getServer() != null; 
>+		return (getServer() != null && checkHostAndServerType());
> 	}
> 
>+	private boolean checkHostAndServerType(){
>+		boolean isComplete = false;
>+		IServerType selectedServerType = null;
>+		boolean supportsRemote = true;
>+
>+		IServerWorkingCopy server = getServer();
>+		if(server != null){
>+			selectedServerType = server.getServerType();
>+		}
>+		
>+		if(selectedServerType != null){
>+			supportsRemote = selectedServerType.supportsRemoteHosts();			
>+			
>+			if(comp != null){
>+				Composite composite  = comp.getNewManualServerComposite();
>+				if(composite != null && composite instanceof NewManualServerComposite){
>+					NewManualServerComposite manualComp = (NewManualServerComposite)composite;
>+					String curHostname = manualComp.getCurrentHostname();
>+
>+					if(!supportsRemote && !SocketUtil.isLocalhost(curHostname)){
>+						isComplete = false;
>+					}
>+					else
>+						isComplete = true;
>+				}
>+			}
>+		}
>+		return isComplete;
>+	}
>+	
> 	private IServerWorkingCopy getServer() {
> 		try {
> 			return (IServerWorkingCopy) getTaskModel().getObject(TaskModel.TASK_SERVER);
>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.44
>diff -u -r1.44 NewManualServerComposite.java
>--- serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java	25 Nov 2009 21:16:23 -0000	1.44
>+++ serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java	30 Nov 2009 19:08:16 -0000
>@@ -350,12 +350,18 @@
> 			return;
> 		
> 		boolean changed = false;
>+		
> 		if (host == null) {
>+			checkHostAndServerType();
>+			changed = serverTypeComposite.setHost(true);
>+		} else if (SocketUtil.isLocalhost(host)){
>+			checkHostAndServerType();
> 			changed = serverTypeComposite.setHost(true);
>-		} else if (SocketUtil.isLocalhost(host))
>+		}
>+		else {
>+			checkHostAndServerType();
> 			changed = serverTypeComposite.setHost(true);
>-		else
>-			changed = serverTypeComposite.setHost(false);
>+		}
> 		
> 		if (changed)
> 			handleTypeSelection(serverTypeComposite.getSelectedServerType());
>@@ -610,6 +616,7 @@
> 			}
> 		}
> 		listener.serverSelected(server);
>+		checkHostAndServerType();
> 		wizard.update();
> 	}
> 
>@@ -657,4 +664,28 @@
> 		host = newHost;
> 		hostnameListener.hostnameSelected(host);
> 	}
>+	
>+	public String getCurrentHostname(){
>+		if(hostname != null)
>+			return hostname.getText();
>+			
>+		return null;
>+	}
>+	
>+	public void checkHostAndServerType(){
>+		IServerType selectedServerType = serverTypeComposite.getSelectedServerType();
>+		
>+		boolean supportsRemote = true;
>+
>+		if(selectedServerType != null){
>+			supportsRemote = selectedServerType.supportsRemoteHosts();			
>+				
>+			if(!supportsRemote && !SocketUtil.isLocalhost(hostname.getText())){
>+				wizard.setMessage(NLS.bind(Messages.wizCheckRemoteSupport, new Object[0]), IMessageProvider.ERROR);
>+			}
>+			else {
>+				wizard.setMessage(null, IMessageProvider.NONE);
>+			}
>+		}
>+	}
> }
>\ No newline at end of file
>Index: serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java,v
>retrieving revision 1.33
>diff -u -r1.33 NewServerComposite.java
>--- serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java	25 Nov 2009 21:16:23 -0000	1.33
>+++ serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java	30 Nov 2009 19:08:16 -0000
>@@ -539,4 +539,7 @@
> 					c[i].setVisible(visible);
> 		}
> 	}
>+	public NewManualServerComposite getNewManualServerComposite (){
>+		return manualComp;
>+	}
> }
>\ No newline at end of file

Flags:

swosnick: review?

Actions: View

Attachments on bug 291120: 152778 | 153120 | 153121 | 153173 | 153190 | 153379 | 153384 | 153385 | 153605 | 153607 | 153621