Attachment 152778 Details for Bug 291120 – Creates the host name controls before server name control instead of first input from user

[patch] Creates the host name controls before server name control instead of first input from user

HostnameReorder.txt (text/plain), 6.65 KB, created by Sheldon Wosnick

on 2009-11-21 01:01:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Sheldon Wosnick

Created: 2009-11-21 01:01:45 EST

Size: 6.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.server.ui
>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.32
>diff -u -r1.32 NewServerComposite.java
>--- serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java	24 Apr 2008 03:22:54 -0000	1.32
>+++ serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewServerComposite.java	21 Nov 2009 05:47:02 -0000
>@@ -449,7 +449,6 @@
> 		manualComp2.setLayout(layout);
> 		manualComp2.setLayoutData(new GridData(GridData.FILL_BOTH));
> 		
>-		manualHostComp = createHostComposite(manualComp2);
> 		IModuleType mt = moduleType;
> 		boolean includeIncompatible = true;
> 		if (moduleType != null)
>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.43
>diff -u -r1.43 NewManualServerComposite.java
>--- serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java	18 Feb 2009 21:46:10 -0000	1.43
>+++ serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java	21 Nov 2009 05:47:02 -0000
>@@ -21,12 +21,19 @@
> import org.eclipse.jface.action.ToolBarManager;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IMessageProvider;
>+import org.eclipse.jface.fieldassist.AutoCompleteField;
>+import org.eclipse.jface.fieldassist.ControlDecoration;
>+import org.eclipse.jface.fieldassist.FieldDecoration;
>+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
>+import org.eclipse.jface.fieldassist.TextContentAdapter;
> import org.eclipse.jface.operation.IRunnableWithProgress;
> import org.eclipse.jface.preference.PreferenceDialog;
> import org.eclipse.jface.window.Window;
> import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.FocusEvent;
>+import org.eclipse.swt.events.FocusListener;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.events.SelectionAdapter;
>@@ -43,14 +50,30 @@
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.dialogs.PreferencesUtil;
> import org.eclipse.ui.help.IWorkbenchHelpSystem;
>-import org.eclipse.wst.server.core.*;
>+import org.eclipse.wst.server.core.IModule;
>+import org.eclipse.wst.server.core.IModuleType;
>+import org.eclipse.wst.server.core.IRuntime;
>+import org.eclipse.wst.server.core.IRuntimeType;
>+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
>+import org.eclipse.wst.server.core.IServerAttributes;
>+import org.eclipse.wst.server.core.IServerType;
>+import org.eclipse.wst.server.core.IServerWorkingCopy;
>+import org.eclipse.wst.server.core.ServerUtil;
>+import org.eclipse.wst.server.core.TaskModel;
> import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
> import org.eclipse.wst.server.core.util.SocketUtil;
>-import org.eclipse.wst.server.ui.internal.*;
>+import org.eclipse.wst.server.ui.internal.ContextIds;
>+import org.eclipse.wst.server.ui.internal.ImageResource;
>+import org.eclipse.wst.server.ui.internal.Messages;
>+import org.eclipse.wst.server.ui.internal.SWTUtil;
>+import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
>+import org.eclipse.wst.server.ui.internal.Trace;
> import org.eclipse.wst.server.ui.internal.viewers.ServerTypeComposite;
> import org.eclipse.wst.server.ui.internal.wizard.TaskWizard;
> import org.eclipse.wst.server.ui.internal.wizard.WizardTaskUtil;
>+import org.eclipse.wst.server.ui.internal.wizard.page.HostnameComposite.IHostnameSelectionListener;
> import org.eclipse.wst.server.ui.wizard.WizardFragment;
>+
> /**
>  * Wizard page used to create a server and configuration at the same time.
>  */
>@@ -92,6 +115,13 @@
> 	protected IModule module;
> 	protected String serverTypeId;
> 	protected boolean includeIncompatible;
>+	
>+	protected String lastHostname;
>+	protected HostnameComposite manualHostComp;
>+	IHostnameSelectionListener hostnameListener;
>+	protected Text hostname;
>+	protected ControlDecoration hostnameDecoration;
>+	protected final String LOCALHOST = "localhost";
> 
> 	protected ServerCreationCache cache = new ServerCreationCache();
> 
>@@ -151,6 +181,47 @@
> 		serverTypeComposite.setLayoutData(data);
> 		whs.setHelp(serverTypeComposite, ContextIds.NEW_SERVER_TYPE);
> 		
>+		hostnameListener = 	new IHostnameSelectionListener() {
>+			public void hostnameSelected(String selectedHostname) {
>+				lastHostname = selectedHostname;
>+				setHost(selectedHostname);
>+			}
>+	    };		
>+		Label hostnameLabel = new Label(this, SWT.NONE);
>+		hostnameLabel.setText(Messages.hostname);
>+		hostname = new Text(this, SWT.SINGLE | SWT.BORDER | SWT.CANCEL);
>+		hostname.setText(LOCALHOST);
>+		hostnameDecoration = new ControlDecoration(hostname, SWT.TOP | SWT.LEAD);
>+		
>+		GridData data2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL );
>+		hostname.setLayoutData(data2);
>+		new Label(this, SWT.NONE);
>+		
>+		hostname.addModifyListener(new ModifyListener() {
>+			public void modifyText(ModifyEvent e) {
>+				hostnameChanged(hostname.getText());
>+			}
>+		});
>+		
>+		FieldDecorationRegistry registry = FieldDecorationRegistry.getDefault();
>+		FieldDecoration fd = registry.getFieldDecoration(FieldDecorationRegistry.DEC_CONTENT_PROPOSAL);
>+		hostnameDecoration.setImage(fd.getImage());
>+		hostnameDecoration.setDescriptionText(fd.getDescription());
>+		
>+		hostname.addFocusListener(new FocusListener() {
>+			public void focusGained(FocusEvent e) {
>+				hostnameDecoration.show();
>+			}
>+
>+			public void focusLost(FocusEvent e) {
>+				hostnameDecoration.hide();
>+			}
>+		});
>+		
>+		List<String> hosts = ServerUIPlugin.getPreferences().getHostnames();
>+		String[] hosts2 = hosts.toArray(new String[hosts.size()]);
>+		new AutoCompleteField(hostname, new TextContentAdapter(), hosts2);
>+		
> 		Label serverNameLabel = new Label(this, SWT.NONE);
> 		serverNameLabel.setText(Messages.serverName);
> 		
>@@ -601,4 +672,15 @@
> 	public IServerWorkingCopy getServer() {
> 		return server;
> 	}
>+	protected void hostnameChanged(String newHost) {
>+		if (newHost == null)
>+			return;
>+		
>+		if (newHost.equals(host))
>+			return;
>+
>+		host = newHost;
>+
>+		hostnameListener.hostnameSelected(host);
>+	}
> }
>\ No newline at end of file

Actions: View | Diff

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