Attachment #25640 for bug #84808

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

Lines 104-109 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java (+9 lines)
104	private boolean crash;	104	private boolean crash;
105		105
106	private boolean autoShareOnImport;	106	private boolean autoShareOnImport;
		107	private boolean useProjectNameOnCheckout;
107		108
108	public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() {	109	public synchronized CVSWorkspaceSubscriber getCVSWorkspaceSubscriber() {
109	if (cvsWorkspaceSubscriber == null) {	110	if (cvsWorkspaceSubscriber == null) {
Lines 589-592 Link Here
589	public boolean isAutoshareOnImport() {	590	public boolean isAutoshareOnImport() {
590	return autoShareOnImport;	591	return autoShareOnImport;
591	}	592	}
		593
		594	public void setUseProjectNameOnCheckout(boolean useProjectNameOnCheckout) {
		595	this.useProjectNameOnCheckout = useProjectNameOnCheckout;
		596	}
		597
		598	public boolean isUseProjectNameOnCheckout() {
		599	return useProjectNameOnCheckout;
		600	}
592	}	601	}




package org.eclipse.team.internal.ccvs.core;

 
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;

 /**

	 * 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();
}




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;

	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);

		// 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;
	}
}

Return to bug 84808

Lines 11-16 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/ICVSRemoteFolder.java (-1 / +18 lines)
11	package org.eclipse.team.internal.ccvs.core;	11	package org.eclipse.team.internal.ccvs.core;
12		12
13		13
		14	import org.eclipse.core.resources.IProjectDescription;
14	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;	15	import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
15		16
16	/**	17	/**
Lines 54-57 Link Here
54	* definition).	55	* definition).
55	*/	56	*/
56	public boolean isDefinedModule();	57	public boolean isDefinedModule();
57	}	58
		59	/**
		60	* @param name The project name to set.
		61	*/
		62	public void setProjectName(String name);
		63
		64	/**
		65	* @return true is the project name has been set, false otherwise.
		66	*/
		67	public boolean hasProjectName();
		68
		69	/**
		70	* @return the project name derived from the project description
		71	* The name is guaranteed to be null or non empty string
		72	*/
		73	public String getProjectName();
		74	}

Lines 14-19 Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java (+25 lines)
14	import java.util.ArrayList;	14	import java.util.ArrayList;
15	import java.util.List;	15	import java.util.List;
16		16
		17	import org.eclipse.core.resources.IProjectDescription;
17	import org.eclipse.core.resources.IResource;	18	import org.eclipse.core.resources.IResource;
18	import org.eclipse.core.runtime.*;	19	import org.eclipse.core.runtime.*;
19	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
Lines 50-55 Link Here
50	protected FolderSyncInfo folderInfo;	51	protected FolderSyncInfo folderInfo;
51	private ICVSRemoteResource[] children;	52	private ICVSRemoteResource[] children;
52	private ICVSRepositoryLocation repository;	53	private ICVSRepositoryLocation repository;
		54	private String projectName;
53		55
54	public static RemoteFolder fromBytes(IResource local, byte[] bytes) throws CVSException {	56	public static RemoteFolder fromBytes(IResource local, byte[] bytes) throws CVSException {
55	Assert.isNotNull(bytes);	57	Assert.isNotNull(bytes);
Lines 585-588 Link Here
585	// This should not get called for folders	587	// This should not get called for folders
586	}	588	}
587		589
		590	/* (non-Javadoc)
		591	* @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#hasProjectDescription()
		592	*/
		593	public boolean hasProjectName() {
		594	return projectName == null ? false : true;
		595	}
		596
		597	/* (non-Javadoc)
		598	* @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#setProjectDescription(org.eclipse.core.resources.IProjectDescription)
		599	*/
		600	public void setProjectName(String name) {
		601	this.projectName = name;
		602	}
		603
		604	/* (non-Javadoc)
		605	* @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#getProjectName()
		606	*/
		607	public String getProjectName() {
		608	if (projectName == null \|\| projectName.equals("")) { //$NON-NLS-1$
		609	return null;
		610	}
		611	return projectName;
		612	}
588	}	613	}