Attachment 19272 Details for Bug 65301 – Allows host to take a complete CVS string

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Allows host to take a complete CVS string

ConfigCVS2.patch (text/plain), 3.57 KB, created by Michael Fraenkel

on 2005-03-29 09:29:25 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Fraenkel

Created: 2005-03-29 09:29:25 EST

Size: 3.57 KB

patch

obsolete

>Index: ConfigurationWizardMainPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java,v
>retrieving revision 1.38
>diff -u -r1.38 ConfigurationWizardMainPage.java
>--- ConfigurationWizardMainPage.java	22 Feb 2005 19:46:32 -0000	1.38
>+++ ConfigurationWizardMainPage.java	29 Mar 2005 14:25:39 -0000
>@@ -327,6 +327,15 @@
> 		return result;
> 	}
> 	
>+	private CVSRepositoryLocation createLocation() throws CVSException {
>+		String host = hostCombo.getText();
>+		if (host.charAt(0) == ':') {
>+			return CVSRepositoryLocation.fromString(host);
>+		}
>+		
>+		return CVSRepositoryLocation.fromProperties(createProperties());
>+	}
>+	
> 	/**
> 	 * Crate a new location with the information entered on the page.
> 	 * The location will exists and can be sed for connecting but is not
>@@ -338,7 +347,7 @@
> 	public ICVSRepositoryLocation getLocation() throws CVSException {
> 		if (location == null) {
> 			if (!isPageComplete()) return null;
>-			location = CVSRepositoryLocation.fromProperties(createProperties());
>+			location = createLocation();
> 			if (location.equals(oldLocation)) {
> 				location = oldLocation;
> 			}
>@@ -482,34 +491,35 @@
> 	 * and error messages appropriately.
> 	 */
> 	private void validateFields() {
>-		String user = userCombo.getText();
>-		IStatus status = validateUserName(user);
>-		if (!isStatusOK(status)) {
>-			return;
>-		}
>-
> 		String host = hostCombo.getText();
>-		status = validateHost(host);
>+		IStatus status = validateHost(host);
> 		if (!isStatusOK(status)) {
> 			return;
> 		}
> 
>-		if (portText.isEnabled()) {
>-			String port = portText.getText();
>-			status = validatePort(port);
>+		if (host.charAt(0) != ':') {
>+			String user = userCombo.getText();
>+			status = validateUserName(user);
> 			if (!isStatusOK(status)) {
> 				return;
> 			}
>-		}
>+		
>+			if (portText.isEnabled()) {
>+				String port = portText.getText();
>+				status = validatePort(port);
>+				if (!isStatusOK(status)) {
>+					return;
>+				}
>+			}
> 
>-		String pathString = repositoryPathCombo.getText();
>-		status = validatePath(pathString);
>-		if (!isStatusOK(status)) {
>-			return;
>+			String pathString = repositoryPathCombo.getText();
>+			status = validatePath(pathString);
>+			if (!isStatusOK(status)) {
>+				return;
>+			}
> 		}
>-
> 		try {
>-			CVSRepositoryLocation l = CVSRepositoryLocation.fromProperties(createProperties());
>+			CVSRepositoryLocation l = createLocation();
> 			if (!l.equals(oldLocation) && KnownRepositories.getInstance().isKnownRepository(l.getLocation())) {
> 				setErrorMessage(Policy.bind("ConfigurationWizardMainPage.0")); //$NON-NLS-1$
> 				setPageComplete(false);
>@@ -565,10 +575,10 @@
> 		if (host.length() == 0) {
> 			return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, Policy.bind("ConfigurationWizardMainPage.2"), null); //$NON-NLS-1$
> 		}
>-		if (host.indexOf(':') != -1) {
>-			return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, 
>-					Policy.bind("ConfigurationWizardMainPage.invalidHostName"), null); //$NON-NLS-1$
>-		}
>+//		if (host.indexOf(':') != -1) {
>+//			return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, 
>+//					Policy.bind("ConfigurationWizardMainPage.invalidHostName"), null); //$NON-NLS-1$
>+//		}
> 		if (host.startsWith(" ") || host.endsWith(" ")) { //$NON-NLS-1$ //$NON-NLS-2$
> 			return new Status(IStatus.ERROR, CVSUIPlugin.ID, INVALID_FIELD_CONTENTS, 
> 					Policy.bind("ConfigurationWizardMainPage.5"), null); //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 65301: 19267 | 19272