Attachment 25640 Details for Bug 84808 – Patch 1 or 2 for team.cvs.core

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

[patch] Patch 1 or 2 for team.cvs.core

o.e.team.cvs.core-patch-to-fetch-project-name-from-metadata-2005-08-03.patch (text/plain), 4.20 KB, created by Philippe Ombredanne

on 2005-08-03 17:15:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Ombredanne

Created: 2005-08-03 17:15:23 EDT

Size: 4.20 KB

patch

obsolete

>Index: src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java,v
>retrieving revision 1.99
>diff -u -r1.99 CVSProviderPlugin.java
>--- src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java	11 Apr 2005 14:26:23 -0000	1.99
>+++ src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java	3 Aug 2005 21:07:31 -0000
>@@ -104,6 +104,7 @@
> 	private boolean crash;
> 
>     private boolean autoShareOnImport;
>+    private boolean useProjectNameOnCheckout;
> 
> 	public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() {
> 		if (cvsWorkspaceSubscriber == null) {
>@@ -589,4 +590,12 @@
>     public boolean isAutoshareOnImport() {
>         return autoShareOnImport;
>     }
>+
>+    public void setUseProjectNameOnCheckout(boolean useProjectNameOnCheckout) {
>+        this.useProjectNameOnCheckout = useProjectNameOnCheckout;
>+    }
>+
>+    public boolean isUseProjectNameOnCheckout() {
>+        return useProjectNameOnCheckout;
>+    }
> }
>Index: src/org/eclipse/team/internal/ccvs/core/ICVSRemoteFolder.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRemoteFolder.java,v
>retrieving revision 1.18
>diff -u -r1.18 ICVSRemoteFolder.java
>--- src/org/eclipse/team/internal/ccvs/core/ICVSRemoteFolder.java	22 Feb 2005 19:47:58 -0000	1.18
>+++ src/org/eclipse/team/internal/ccvs/core/ICVSRemoteFolder.java	3 Aug 2005 21:07:31 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.team.internal.ccvs.core;
> 
>  
>+import org.eclipse.core.resources.IProjectDescription;
> import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
> 
>  /**
>@@ -54,4 +55,20 @@
> 	 * definition).
> 	 */
> 	public boolean isDefinedModule();
>-}
>+	
>+	/**
>+	 * @param name The project name to set.
>+	 */
>+	public void setProjectName(String name);
>+
>+	/**
>+	 * @return true is the project name has been set, false otherwise.
>+	 */
>+	public boolean hasProjectName();
>+	
>+	/**
>+	 * @return the project name derived from the project description
>+	 * The name is guaranteed to be null or non empty string 
>+	 */
>+	public String getProjectName();
>+}
>\ No newline at end of file
>Index: src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java,v
>retrieving revision 1.86
>diff -u -r1.86 RemoteFolder.java
>--- src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java	28 Apr 2005 13:01:26 -0000	1.86
>+++ src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java	3 Aug 2005 21:07:31 -0000
>@@ -14,6 +14,7 @@
> import java.util.ArrayList;
> import java.util.List;
> 
>+import org.eclipse.core.resources.IProjectDescription;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.*;
> import org.eclipse.osgi.util.NLS;
>@@ -50,6 +51,7 @@
> 	protected FolderSyncInfo folderInfo;
> 	private ICVSRemoteResource[] children;
> 	private ICVSRepositoryLocation repository;
>+	private String projectName;
> 	
> 	public static RemoteFolder fromBytes(IResource local, byte[] bytes) throws CVSException {
> 		Assert.isNotNull(bytes);
>@@ -585,4 +587,27 @@
> 		// This should not get called for folders
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#hasProjectDescription()
>+	 */
>+	public boolean hasProjectName() {
>+		return projectName == null ? false : true;
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#setProjectDescription(org.eclipse.core.resources.IProjectDescription)
>+	 */
>+	public void setProjectName(String name) {
>+		this.projectName = name;
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#getProjectName()
>+	 */
>+	public String getProjectName() {
>+		if (projectName == null || projectName.equals("")) { //$NON-NLS-1$
>+			return null;
>+		}
>+		return projectName;
>+	}
> }

Actions: View | Diff

Attachments on bug 84808: 25145 | 25640 | 25641 | 26058