Attachment #26058 for bug #84808

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




 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/

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

		new Checkbox(composite, ICVSUIConstants.PREF_DEBUG_PROTOCOL, CVSUIMessages.CVSPreferencesPage_17, IHelpContextIds.PREF_DEBUG_PROTOCOL);
		new Checkbox(composite, ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, CVSUIMessages.CVSPreferencesPage_18, IHelpContextIds.PREF_AUTOREFRESH_TAG);
        new Checkbox(composite, ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, CVSUIMessages.CVSPreferencesPage_44, null);
        new Checkbox(composite, ICVSUIConstants.PREF_USE_PROJECT_NAME_ON_CHECKOUT, CVSUIMessages.CVSPreferencesPage_45, null);
        
        final Composite textComposite= SWTUtils.createHFillComposite(composite, SWTUtils.MARGINS_NONE, 2);
        new TextField(

		CVSProviderPlugin.getPlugin().setUsePlatformLineend(store.getBoolean(ICVSUIConstants.PREF_USE_PLATFORM_LINEEND));
		CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION));
        CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT));
        CVSUIPlugin.getPlugin().setUseProjectNameOnCheckout(store.getBoolean(ICVSUIConstants.PREF_USE_PROJECT_NAME_ON_CHECKOUT));
		
		// changing the default keyword substitution mode for text files may affect
		// information displayed in the decorators




 * Contributors: 
 *     IBM - Initial API and implementation
 *     Maik Schreiber - bug 102461
 *     Philippe Ombredanne - bug 84808
 **********************************************************************/
package org.eclipse.team.internal.ccvs.ui;


	public static String CVSPreferencesPage_42;
	public static String CVSPreferencesPage_43;
    public static String CVSPreferencesPage_44;
    public static String CVSPreferencesPage_45;
	public static String CVSPropertiesPage_virtualModule;



	public static String WorkspaceChangeSetCapability_7;
	public static String WorkspaceChangeSetCapability_8;

	public static String ProjectMetaFile_taskName;
	public static String TagFromWorkspace_taskName;
	public static String TagFromRepository_taskName;
	public static String UpdateOnlyMergeable_taskName;

Lines 7-12 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java (-1 / +18 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Philippe Ombredanne - bug 84808
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.team.internal.ccvs.ui;	13	package org.eclipse.team.internal.ccvs.ui;
Lines 81-87 Link Here
81	private RepositoryManager repositoryManager;	82	private RepositoryManager repositoryManager;
82		83
83	private SubscriberChangeSetCollector changeSetManager;	84	private SubscriberChangeSetCollector changeSetManager;
84		85
		86	/**
		87	* A preference to use the project name from the .project metafile
		88	* instead of the module name for project name if available
		89	*/
		90	private boolean useProjectNameOnCheckout;
		91
85	/**	92	/**
86	* CVSUIPlugin constructor	93	* CVSUIPlugin constructor
87	*	94	*
Lines 532-537 Link Here
532	store.setDefault(ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, false);	539	store.setDefault(ICVSUIConstants.PREF_AUTO_REFRESH_TAGS_IN_TAG_SELECTION_DIALOG, false);
533	store.setDefault(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, true);	540	store.setDefault(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT, true);
534	store.setDefault(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT, false);	541	store.setDefault(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT, false);
		542	store.setDefault(ICVSUIConstants.PREF_USE_PROJECT_NAME_ON_CHECKOUT, false);
535	store.setDefault(ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, 1000);	543	store.setDefault(ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD, 1000);
536		544
537	PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, new RGB(0, 0, 0));	545	PreferenceConverter.setDefault(store, ICVSUIConstants.PREF_CONSOLE_COMMAND_COLOR, new RGB(0, 0, 0));
Lines 588-593 Link Here
588	CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION));	596	CVSProviderPlugin.getPlugin().setDetermineVersionEnabled(store.getBoolean(ICVSUIConstants.PREF_DETERMINE_SERVER_VERSION));
589	CVSProviderPlugin.getPlugin().setDebugProtocol(CVSProviderPlugin.getPlugin().isDebugProtocol() \|\| store.getBoolean(ICVSUIConstants.PREF_DEBUG_PROTOCOL));	597	CVSProviderPlugin.getPlugin().setDebugProtocol(CVSProviderPlugin.getPlugin().isDebugProtocol() \|\| store.getBoolean(ICVSUIConstants.PREF_DEBUG_PROTOCOL));
590	CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT));	598	CVSProviderPlugin.getPlugin().setAutoshareOnImport(store.getBoolean(ICVSUIConstants.PREF_AUTO_SHARE_ON_IMPORT));
		599	CVSUIPlugin.getPlugin().setUseProjectNameOnCheckout(store.getBoolean(ICVSUIConstants.PREF_USE_PROJECT_NAME_ON_CHECKOUT));
591	}	600	}
592		601
593	/**	602	/**
Lines 700-703 Link Here
700	throw new InvocationTargetException(e);	709	throw new InvocationTargetException(e);
701	}	710	}
702	}	711	}
		712
		713	public void setUseProjectNameOnCheckout(boolean useProjectNameOnCheckout) {
		714	this.useProjectNameOnCheckout = useProjectNameOnCheckout;
		715	}
		716
		717	public boolean isUseProjectNameOnCheckout() {
		718	return useProjectNameOnCheckout;
		719	}
703	}	720	}

Lines 7-12 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java (+2 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Philippe Ombredanne - bug 84808
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.team.internal.ccvs.ui;	13	package org.eclipse.team.internal.ccvs.ui;
Lines 96-101 Link Here
96	public final String PREF_COMMIT_FILES_DISPLAY_THRESHOLD = "pref_commit_files_display_threshold"; //$NON-NLS-1$	97	public final String PREF_COMMIT_FILES_DISPLAY_THRESHOLD = "pref_commit_files_display_threshold"; //$NON-NLS-1$
97	public final String PREF_AUTO_SHARE_ON_IMPORT = "pref_auto_share_on_import"; //$NON-NLS-1$	98	public final String PREF_AUTO_SHARE_ON_IMPORT = "pref_auto_share_on_import"; //$NON-NLS-1$
98	public final String PREF_ENABLE_WATCH_ON_EDIT = "pref_enable_watch_on_edit"; //$NON-NLS-1$	99	public final String PREF_ENABLE_WATCH_ON_EDIT = "pref_enable_watch_on_edit"; //$NON-NLS-1$
		100	public final String PREF_USE_PROJECT_NAME_ON_CHECKOUT = "pref_use_project_name_on_checkout"; //$NON-NLS-1$
99	// console preferences	101	// console preferences
100	public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$	102	public final String PREF_CONSOLE_COMMAND_COLOR = "pref_console_command_color"; //$NON-NLS-1$
101	public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$	103	public final String PREF_CONSOLE_MESSAGE_COLOR = "pref_console_message_color"; //$NON-NLS-1$




# Contributors:
#     IBM Corporation - initial API and implementation
#     Maik Schreiber - bug 102461
#     Philippe Ombredanne - bug 84808
###############################################################################
PasswordManagementPreferencePage_2=When you create a CVS repository location you have the option of saving the password to disk. This page allows you to manage the stored passwords. The following CVS repository locations have saved passwords:
PasswordManagementPreferencePage_3=Location

CVSPreferencesPage_42=&Open perspective after a 'Show Annotations' operation
CVSPreferencesPage_43=D&efault perspective for 'Show Annotations':
CVSPreferencesPage_44=Aut&omatically share projects containing CVS meta information
CVSPreferencesPage_45=Use .project &project name instead of module name on check out
CVSPropertiesPage_virtualModule=<no corresponding remote folder>



WorkspaceChangeSetCapability_8=Edit the name and comment for the change set


ProjectMetaFile_taskName=Looking for a remote meta file
TagFromWorkspace_taskName=Tagging from workspace
TagFromRepository_taskName=Tagging from repository
UpdateOnlyMergeable_taskName=Updating mergeable changes




 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.actions;


import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.operations.CheckoutMultipleProjectsOperation;
import org.eclipse.team.internal.ccvs.ui.operations.ProjectMetaFileOperation;

/**
 * Checkout a remote module into the workspace ensuring that the user is prompted for

	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
	 */
	protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
		new CheckoutMultipleProjectsOperation(getTargetPart(), getSelectedRemoteFoldersWithProjectName(), null)
			.run();
	}
	

	   }
	   return true;
   }

	/**
	 * Get selected CVS remote folders, and add Project Description 
	 * from metafile if available based on preferences settings
	 * @throws InterruptedException 
	 * @throws InvocationTargetException 
	 */
	private ICVSRemoteFolder[] getSelectedRemoteFoldersWithProjectName() throws InvocationTargetException, InterruptedException {
		ICVSRemoteFolder[] folders = getSelectedRemoteFolders();
		if (CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout()){
			folders = ProjectMetaFileOperation.updateFoldersWithProjectName(getTargetPart(), folders);
		}
		return folders;
	}
}




 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.actions;


import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.operations.ProjectMetaFileOperation;
import org.eclipse.team.internal.ccvs.ui.wizards.CheckoutAsWizard;

public class CheckoutAsAction extends CVSAction {

	 */
	public void execute(IAction action) throws InvocationTargetException, InterruptedException {
		ICVSRemoteFolder[] folders = getSelectedRemoteFolders();
		boolean withName = CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout();
		ProjectMetaFileOperation op = new ProjectMetaFileOperation(getTargetPart(), folders, withName);
		op.run();
		
		// project configuration allowed only if single folder without metafile
		boolean allowProjectConfig = (folders.length == 1 && !op.metaFileExists());
		
		if (withName) {
			folders = op.getUpdatedFolders();
		}
		
		CheckoutAsWizard wizard = new CheckoutAsWizard(getTargetPart(), folders, allowProjectConfig);
		WizardDialog dialog = new WizardDialog(shell, wizard);
		dialog.open();
	}
	
	/*
	 * Return true if the remote project does not have a .project file
	 * so that the checkout wizard will give the option to launch
	 * the New Project wizard
	 */
	protected boolean allowProjectConfiguration(ICVSRemoteFolder[] folders) throws InvocationTargetException, InterruptedException {
		if (folders.length != 1) return false;
		return !HasProjectMetaFileOperation.hasMetaFile(getTargetPart(), folders[0]);	
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
	 */




 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.operations;


import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer;
import org.eclipse.team.internal.ccvs.core.resources.RemoteProjectFolder;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.ui.*;
import org.eclipse.team.internal.ccvs.ui.Policy;

				project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
			}
			
			// Check to see if using remote metafile project description name is preferred
			if (project == null 
					&& CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout() 
					&& resource instanceof RemoteProjectFolder) {
				RemoteProjectFolder rpf = (RemoteProjectFolder) resource;
				if (rpf.hasProjectName())
				{
					// no project was specified but we need to attempt the creation of one 
					// based on the metafile project name 
					project = ResourcesPlugin.getWorkspace().getRoot().getProject(rpf.getProjectName());
				}
			}
			
			// Determine the local target projects (either the project provider or the module expansions)
			// Note: Module expansions can be run over the same connection as a checkout
			final IProject[] targetProjects = determineProjects(session, resource, project, Policy.subMonitorFor(pm, 5));

			if (expansions.length == 1 && expansions[0].equals(moduleName)) {
				// For a remote folder, use the last segment as the project to be created
				String lastSegment = new Path(null, expansions[0]).lastSegment();
				// if using metafile project name is preferred, use it
				if (CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout() && remoteFolder instanceof RemoteProjectFolder) {
					RemoteProjectFolder rpf = (RemoteProjectFolder) remoteFolder;
					if (rpf.hasProjectName()) {
						lastSegment = rpf.getProjectName();
					}
				} 
				targetProjectSet.add(ResourcesPlugin.getWorkspace().getRoot().getProject(lastSegment));
			} else {
				for (int j = 0; j < expansions.length; j++) {




/*******************************************************************************
 * Copyright (c) 2000, 2004 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.operations;

import java.lang.reflect.InvocationTargetException;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.ui.IWorkbenchPart;

/**
 * Operation which checks for the existance of the .project file
 * in a remote folder. The operation can be run using the <code>hasMetaFile</code>
 * static method of by executing the operation and then checking <code>metaFileExists</code>
 */
public class HasProjectMetaFileOperation extends CVSOperation {

	private ICVSRemoteFolder remoteFolder;
	private boolean metaFileExists;
	
	public static boolean hasMetaFile(IWorkbenchPart part, ICVSRemoteFolder remoteFolder) throws InvocationTargetException, InterruptedException {
		HasProjectMetaFileOperation op = new HasProjectMetaFileOperation(part, remoteFolder);
		op.run();
		return op.metaFileExists();
	}
	
	public HasProjectMetaFileOperation(IWorkbenchPart part, ICVSRemoteFolder remoteFolder) {
		super(part);
		this.remoteFolder = remoteFolder;
	}
	
	/*
	 * Return true if the provided remote folder contains a valid meta-file 
	 * (i.e. .project file).
	 */
	private boolean hasMetaFile(ICVSRemoteFolder folder, IProgressMonitor monitor) throws CVSException {
		
		// make a copy of the folder so that we will not effect the original folder when we refetch the members
		// TODO: this is a strange thing to need to do. We shold fix this.
		folder = (ICVSRemoteFolder)folder.forTag(remoteFolder.getTag());

		try {
			folder.members(monitor);
		} catch (TeamException e) {
			throw CVSException.wrapException(e);
		}
		// Check for the existance of the .project file
		try {
			folder.getFile(".project"); //$NON-NLS-1$
			return true;
		} catch (TeamException e) {
			// We couldn't retrieve the meta file so assume it doesn't exist
		}
		return false;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
	 */
	public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
		metaFileExists = hasMetaFile(remoteFolder, monitor);
	}
	
	/**
	 * Return true if the meta file exists remotely. This method should only be invoked
	 * after the operation has been executed;
	 * @return
	 */
	public boolean metaFileExists() {
		return metaFileExists;
	}

	protected String getTaskName() {
		return CVSUIMessages.HasProjectMetaFile_taskName; 
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#canRunAsJob()
	 */
	public boolean canRunAsJob() {
		// This operation should never be run in the background.
		return false;
	}

}

Lines 7-12 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java (+19 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Philippe Ombredanne - bug 84808
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.wizards;	12	package org.eclipse.team.internal.ccvs.ui.wizards;
12		13
Lines 24-29 Link Here
24	import org.eclipse.swt.layout.GridData;	25	import org.eclipse.swt.layout.GridData;
25	import org.eclipse.swt.layout.GridLayout;	26	import org.eclipse.swt.layout.GridLayout;
26	import org.eclipse.swt.widgets.*;	27	import org.eclipse.swt.widgets.*;
		28	import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
		29	import org.eclipse.team.internal.ccvs.core.resources.RemoteProjectFolder;
27	import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;	30	import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
28	import org.eclipse.ui.model.WorkbenchContentProvider;	31	import org.eclipse.ui.model.WorkbenchContentProvider;
29	import org.eclipse.ui.model.WorkbenchLabelProvider;	32	import org.eclipse.ui.model.WorkbenchLabelProvider;
Lines 310-313 Link Here
310	}	313	}
311	return super.canFlipToNextPage();	314	return super.canFlipToNextPage();
312	}	315	}
		316
		317	/**
		318	* Utility method to get a folder name based on preferences.
		319	* Returns the folder name or the project name retrieved from the project metafile
		320	* @param the CVS remote folder
		321	* @return a project name
		322	*/
		323	static protected String getPreferredFolderName(ICVSRemoteFolder folder) {
		324	if (CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout() && folder instanceof RemoteProjectFolder ) {
		325	RemoteProjectFolder rpf = (RemoteProjectFolder) folder;
		326	if (rpf.hasProjectName()) {
		327	return rpf.getProjectName();
		328	}
		329	}
		330	return folder.getName();
		331	}
313	}	332	}




 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.wizards;


	
	private IProject getSingleProject() {
		if (singleProject == null) {
			setProjectName(getPreferredFolderName(remoteFolders[0]));
		}
		return singleProject;
	}

					return locationStatus.getMessage();
			} else {
				for (int i = 0; i < remoteFolders.length; i++) {
					String projectName = getPreferredFolderName(remoteFolders[i]);
					IStatus locationStatus = ResourcesPlugin.getWorkspace().validateProjectLocation(
						ResourcesPlugin.getWorkspace().getRoot().getProject(projectName),
						new Path(targetLocation).append(projectName));

Lines 7-12 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java (-1 / +2 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Philippe Ombredanne - bug 84808
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.wizards;	12	package org.eclipse.team.internal.ccvs.ui.wizards;
12		13
Lines 87-93 Link Here
87	* For the single folder case, return the name of the folder	88	* For the single folder case, return the name of the folder
88	*/	89	*/
89	private String getFolderName() {	90	private String getFolderName() {
90	String name = folders[0].getName();	91	String name = getPreferredFolderName(folders[0]);
91	if (name .equals(".")) { //$NON-NLS-1$	92	if (name .equals(".")) { //$NON-NLS-1$
92	name = new Path(null, folders[0].getRepository().getRootDirectory()).lastSegment();	93	name = new Path(null, folders[0].getRepository().getRootDirectory()).lastSegment();
93	}	94	}

Lines 7-12 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java (-1 / +2 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Philippe Ombredanne - bug 84808
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.wizards;	12	package org.eclipse.team.internal.ccvs.ui.wizards;
12		13
Lines 73-79 Link Here
73	* For the single folder case, return the name of the folder	74	* For the single folder case, return the name of the folder
74	*/	75	*/
75	private String getInputFolderName() {	76	private String getInputFolderName() {
76	return remoteFolders[0].getName();	77	return getPreferredFolderName(remoteFolders[0]);
77	}	78	}
78		79
79	private String getRepository() throws CVSException {	80	private String getRepository() throws CVSException {




 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.wizards;


		return folders;
	}

	/*
	 * Return the remote folders to be checked out with 
	 * Folder description if available based on preferrences settings
	 */
	private ICVSRemoteFolder[] getRemoteFoldersWithProjectDescriptions() throws InvocationTargetException, InterruptedException {
		ICVSRemoteFolder[] folders = getRemoteFolders();
		if (CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout()) {
			folders = ProjectMetaFileOperation.updateFoldersWithProjectName(part, folders);
		}
		return folders;
	}

	private CVSTag getSelectedTag() {
		return tagSelectionPage.getSelectedTag();
	}

	private boolean performMultipleCheckoutAs() throws InvocationTargetException, InterruptedException {
		String targetLocation = locationSelectionPage.getTargetLocation();
		// Run the checkout in the background
		new CheckoutMultipleProjectsOperation(part, getRemoteFoldersWithProjectDescriptions(), targetLocation).run();
		return true;
	}





 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.wizards;


import org.eclipse.team.internal.ccvs.core.util.KnownRepositories;
import org.eclipse.team.internal.ccvs.ui.*;
import org.eclipse.team.internal.ccvs.ui.operations.CheckoutMultipleProjectsOperation;
import org.eclipse.team.internal.ccvs.ui.operations.ProjectMetaFileOperation;
import org.eclipse.ui.*;

/**

					boolean hasMetafile = true;
					if (selectedModules.length == 1) {
						// Only allow configuration if one module is selected
						final ICVSRemoteFolder[] folders = new ICVSRemoteFolder[] {selectedModules[0]};
						final boolean withName = CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout();

						// attempt to retrieve the project description depending on preferences
						// this is a bit circumvoluted to batch the metafile check and retrieval in one op
						final ICVSRemoteFolder[] folderResult = new ICVSRemoteFolder [1];
						final boolean[] booleanResult = new boolean[] { true };
						
						getContainer().run(true, true, new IRunnableWithProgress() {
							public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
								ProjectMetaFileOperation op = new ProjectMetaFileOperation(getPart(), new ICVSRemoteFolder[] {folders[0]}, withName);
								op.run(monitor);
								folderResult[0] = op.getUpdatedFolders()[0];
								booleanResult[0] = op.metaFileExists();
							}
						});
						hasMetafile = booleanResult[0];
						if (withName && hasMetafile)
							selectedModules[0] = folderResult[0];
					}
					resetSubwizard();
					wizard = new CheckoutAsWizard(getPart(), selectedModules, ! hasMetafile /* allow configuration */);

		return null;
	}

	private boolean hasProjectMetafile(final ICVSRemoteFolder selectedModule) throws InvocationTargetException, InterruptedException {
		final boolean[] result = new boolean[] { true };
		getContainer().run(true, true, new IRunnableWithProgress() {
			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
				HasProjectMetaFileOperation op = new HasProjectMetaFileOperation(getPart(), selectedModule);
				op.run(monitor);
				result[0] = op.metaFileExists();
			}
		});
		return result[0];
	}

	private ICVSRemoteFolder[] getSelectedModules() {
		if (modulePage == null) return null;
		return modulePage.getSelectedModules();




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.core.resources;

/**
 * This  specialized RemoteFolder represents a RemoteFolder that contains
 * a .project metafile and has an additional field representing the project
 * name retrieved from this .project metafile
 */
public class RemoteProjectFolder extends RemoteFolder {

	protected String projectName;

	/**
	 * The Constructor for the RemoteProjectFolder
	 * @param folder the original RemoteFolder to 'clone'
	 * @param projectName the project name retrieved from the project metafile
	 */
	public RemoteProjectFolder(RemoteFolder folder, String projectName) {
		super((RemoteFolder) folder.getParent(), folder.getName(), folder.getRepository(),  
				folder.getRepositoryRelativePath(), folder.getTag(), folder.getFolderSyncInfo().getIsStatic());
		this.projectName = projectName;
	}

	/**
	 * @return true is the project name has been set and is not null or empty, false otherwise.
	 */
	public boolean hasProjectName() {
		if (isProjectNameEmpty()) 
			return false;
		return true;
	}

	/**
	 * @return the project name derived from the project description The name is guaranteed to be a null or a non empty string
	 */
	public String getProjectName() {
		if (isProjectNameEmpty())
			return null;
		return projectName;
	}
	
	private boolean isProjectNameEmpty() {
		return projectName == null || projectName.equals(""); //$NON-NLS-1$
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2004 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Philippe Ombredanne - bug 84808
 *******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.operations;

import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;

import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile;
import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder;
import org.eclipse.team.internal.ccvs.core.resources.RemoteProjectFolder;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.ui.IWorkbenchPart;

/**
 * Operation which checks for the existence of the .project file
 * in a remote folder, or to retrieve the project name for one or more
 * folders based on what is in the .project file.
 * 
 * To check for meta file exitence, the operation can be run 
 * by executing the operation and then checking <code>metaFileExists</code>
 * Use the retrieveContent as false in the constructor, to avoid the 
 * overhead of retrieving the file content too.
 * 
 * To update the folders with project names, the operation can be run
 * by calling the static method <code>updateFoldersWithProjectName</code> 
 * or by executing the operation and then checking <code>getUpdatedFolders</code>
 * to retrieve updated folders.
 * Use the retrieveContent as true in the constructor to retrieve the content.
 * 
 * The <code>metaFileExists</code> flag is always updated regardless of the
 * retrieveContent constructor argument value
 */
public class ProjectMetaFileOperation extends CVSOperation {

	private ICVSRemoteFolder[] remoteFolders;
	private boolean metaFileExists;
	private boolean retrieveContent;
	
	/*
	 * Update a list of folders with their project names
	 * for those folders that have one.
	 */
	public static ICVSRemoteFolder[] updateFoldersWithProjectName(IWorkbenchPart part, ICVSRemoteFolder[] folders)
			throws InvocationTargetException, InterruptedException {
		ProjectMetaFileOperation op = new ProjectMetaFileOperation(part, folders, true /*retrieve metafile content*/);
		op.run();
		return op.getUpdatedFolders();
	}

	public ProjectMetaFileOperation(IWorkbenchPart part, ICVSRemoteFolder[] remoteFolders, boolean retrieveContent) {
		super(part);
		this.remoteFolders = remoteFolders;
		this.retrieveContent = retrieveContent;
	}
	
	/*
	 * Update the folders with a project name if the provided remote folder contains a non empty project name
	 * in its meta-file (i.e. .project file) 
	 * Set the metafile existence to true as needed
	 */
	private void checkForMetafileAndUpdateFoldersWithRemoteProjectName(ICVSRemoteFolder[] folders, IProgressMonitor monitor) throws CVSException {
		metaFileExists = false;
		for (int i = 0; i < folders.length; i++) {
			// make a copy of the folder so that we will not effect the original
			// folder when we refetch the members
			// TODO: this is a strange thing to need to do. We should fix this.
			ICVSRemoteFolder folder = (ICVSRemoteFolder) folders[i].forTag(folders[i].getTag());
		
			try {
				folder.members(monitor);
			} catch (TeamException e) {
				throw CVSException.wrapException(e);
			}
			// Check for the existance of the .project file
			// and attempt to create an IProjectDescription of it
			// and extract the project name
			InputStream in = null;
			try {
				ICVSRemoteFile remote = (ICVSRemoteFile) folder.getFile(".project"); //$NON-NLS-1$
				//if we have gone so far, then a metafile exists.
				metaFileExists = true;
				// retrieve the file content optionally, if requested
				if (retrieveContent && folder instanceof RemoteFolder) {
					RemoteFolder rf = (RemoteFolder) folder;
					
					//load the project description from the retrieved metafile
					in = remote.getContents(monitor);
					if (in == null || monitor.isCanceled()) {
						break;
					}
					IWorkspace workspace = ResourcesPlugin.getWorkspace();
					IProjectDescription projectDesc = workspace.loadProjectDescription(in);
					
					//clone the remote folder into a remote project folder
					//set the project name
					RemoteProjectFolder rpf = new RemoteProjectFolder(rf, projectDesc.getName()); 
					// ... and update back our folder
					folders[i] = rpf;
				}
			} catch (TeamException e) {
				// We couldn't retrieve the project meta file so assume it doesn't
				// exist
			} catch (CoreException e) {
				// We couldn't read the project description, so assume the
				// metafile is not a metafile, or is incorrect
				// which is as if it does not exist
			} finally {
				try {
					if (in != null) {
						in.close();
					}
				} catch (IOException e) {
					// ignore : we cannot read the file, so it's like it is not there
				}
			}
		}
	}

	
	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
	 */
	public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
		checkForMetafileAndUpdateFoldersWithRemoteProjectName(remoteFolders, monitor);
	}
	
	/**
	 * Return true if the meta file exists remotely. This method should only be invoked
	 * after the operation has been executed;
	 * @return
	 */
	public boolean metaFileExists() {
		return metaFileExists;
	}

	/**
	 * @return the updated folders with project name from the remote project meta
	 *         information if the .project file was properly retrieved or the
	 *         unmodified folders if retrieval failed. This method should only be
	 *         invoked after the operation has been executed;
	 */
	public ICVSRemoteFolder[] getUpdatedFolders() {
		return remoteFolders;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
	 */
	protected String getTaskName() {
		return CVSUIMessages.ProjectMetaFile_taskName; //$NON-NLS-1$
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#canRunAsJob()
	 */
	public boolean canRunAsJob() {
		// This operation should never be run in the background.
		return false;
	}
}

Return to bug 84808

Lines 8-13 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/messages.properties (-1 / +3 lines)
8	# Contributors:	8	# Contributors:
9	# IBM Corporation - initial API and implementation	9	# IBM Corporation - initial API and implementation
10	# Maik Schreiber - bug 102461	10	# Maik Schreiber - bug 102461
		11	# Philippe Ombredanne - bug 84808
11	###############################################################################	12	###############################################################################
12	PasswordManagementPreferencePage_2=When you create a CVS repository location you have the option of saving the password to disk. This page allows you to manage the stored passwords. The following CVS repository locations have saved passwords:	13	PasswordManagementPreferencePage_2=When you create a CVS repository location you have the option of saving the password to disk. This page allows you to manage the stored passwords. The following CVS repository locations have saved passwords:
13	PasswordManagementPreferencePage_3=Location	14	PasswordManagementPreferencePage_3=Location
Lines 222-227 Link Here
222	CVSPreferencesPage_42=&Open perspective after a 'Show Annotations' operation	223	CVSPreferencesPage_42=&Open perspective after a 'Show Annotations' operation
223	CVSPreferencesPage_43=D&efault perspective for 'Show Annotations':	224	CVSPreferencesPage_43=D&efault perspective for 'Show Annotations':
224	CVSPreferencesPage_44=Aut&omatically share projects containing CVS meta information	225	CVSPreferencesPage_44=Aut&omatically share projects containing CVS meta information
		226	CVSPreferencesPage_45=Use .project &project name instead of module name on check out
225	CVSPropertiesPage_virtualModule=<no corresponding remote folder>	227	CVSPropertiesPage_virtualModule=<no corresponding remote folder>
226		228
227		229
Lines 837-843 Link Here
837	WorkspaceChangeSetCapability_8=Edit the name and comment for the change set	839	WorkspaceChangeSetCapability_8=Edit the name and comment for the change set
838		840
839		841
840	HasProjectMetaFile_taskName=Looking for a remote meta file	842	ProjectMetaFile_taskName=Looking for a remote meta file
841	TagFromWorkspace_taskName=Tagging from workspace	843	TagFromWorkspace_taskName=Tagging from workspace
842	TagFromRepository_taskName=Tagging from repository	844	TagFromRepository_taskName=Tagging from repository
843	UpdateOnlyMergeable_taskName=Updating mergeable changes	845	UpdateOnlyMergeable_taskName=Updating mergeable changes

Removed Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java (-96 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.operations;
12
13	import java.lang.reflect.InvocationTargetException;
14
15	import org.eclipse.core.runtime.IProgressMonitor;
16	import org.eclipse.team.core.TeamException;
17	import org.eclipse.team.internal.ccvs.core.CVSException;
18	import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
19	import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
20	import org.eclipse.ui.IWorkbenchPart;
21
22	/**
23	* Operation which checks for the existance of the .project file
24	* in a remote folder. The operation can be run using the <code>hasMetaFile</code>
25	* static method of by executing the operation and then checking <code>metaFileExists</code>
26	*/
27	public class HasProjectMetaFileOperation extends CVSOperation {
28
29	private ICVSRemoteFolder remoteFolder;
30	private boolean metaFileExists;
31
32	public static boolean hasMetaFile(IWorkbenchPart part, ICVSRemoteFolder remoteFolder) throws InvocationTargetException, InterruptedException {
33	HasProjectMetaFileOperation op = new HasProjectMetaFileOperation(part, remoteFolder);
34	op.run();
35	return op.metaFileExists();
36	}
37
38	public HasProjectMetaFileOperation(IWorkbenchPart part, ICVSRemoteFolder remoteFolder) {
39	super(part);
40	this.remoteFolder = remoteFolder;
41	}
42
43	/*
44	* Return true if the provided remote folder contains a valid meta-file
45	* (i.e. .project file).
46	*/
47	private boolean hasMetaFile(ICVSRemoteFolder folder, IProgressMonitor monitor) throws CVSException {
48
49	// make a copy of the folder so that we will not effect the original folder when we refetch the members
50	// TODO: this is a strange thing to need to do. We shold fix this.
51	folder = (ICVSRemoteFolder)folder.forTag(remoteFolder.getTag());
52
53	try {
54	folder.members(monitor);
55	} catch (TeamException e) {
56	throw CVSException.wrapException(e);
57	}
58	// Check for the existance of the .project file
59	try {
60	folder.getFile(".project"); //$NON-NLS-1$
61	return true;
62	} catch (TeamException e) {
63	// We couldn't retrieve the meta file so assume it doesn't exist
64	}
65	return false;
66	}
67
68	/* (non-Javadoc)
69	* @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
70	*/
71	public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
72	metaFileExists = hasMetaFile(remoteFolder, monitor);
73	}
74
75	/**
76	* Return true if the meta file exists remotely. This method should only be invoked
77	* after the operation has been executed;
78	* @return
79	*/
80	public boolean metaFileExists() {
81	return metaFileExists;
82	}
83
84	protected String getTaskName() {
85	return CVSUIMessages.HasProjectMetaFile_taskName;
86	}
87
88	/* (non-Javadoc)
89	* @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#canRunAsJob()
90	*/
91	public boolean canRunAsJob() {
92	// This operation should never be run in the background.
93	return false;
94	}
95
96	}

Added Link Here

(-)src/org/eclipse/team/internal/ccvs/core/resources/RemoteProjectFolder.java (+55 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Philippe Ombredanne - bug 84808
11	*******************************************************************************/
12	package org.eclipse.team.internal.ccvs.core.resources;
13
14	/**
15	* This specialized RemoteFolder represents a RemoteFolder that contains
16	* a .project metafile and has an additional field representing the project
17	* name retrieved from this .project metafile
18	*/
19	public class RemoteProjectFolder extends RemoteFolder {
20
21	protected String projectName;
22
23	/**
24	* The Constructor for the RemoteProjectFolder
25	* @param folder the original RemoteFolder to 'clone'
26	* @param projectName the project name retrieved from the project metafile
27	*/
28	public RemoteProjectFolder(RemoteFolder folder, String projectName) {
29	super((RemoteFolder) folder.getParent(), folder.getName(), folder.getRepository(),
30	folder.getRepositoryRelativePath(), folder.getTag(), folder.getFolderSyncInfo().getIsStatic());
31	this.projectName = projectName;
32	}
33
34	/**
35	* @return true is the project name has been set and is not null or empty, false otherwise.
36	*/
37	public boolean hasProjectName() {
38	if (isProjectNameEmpty())
39	return false;
40	return true;
41	}
42
43	/**
44	* @return the project name derived from the project description The name is guaranteed to be a null or a non empty string
45	*/
46	public String getProjectName() {
47	if (isProjectNameEmpty())
48	return null;
49	return projectName;
50	}
51
52	private boolean isProjectNameEmpty() {
53	return projectName == null \|\| projectName.equals(""); //$NON-NLS-1$
54	}
55	}