diff options
author | Michael Valenta | 2002-02-01 21:58:03 +0000 |
---|---|---|
committer | Michael Valenta | 2002-02-01 21:58:03 +0000 |
commit | d436d80e17991fd39937f667a1b4f094de360a93 (patch) | |
tree | 9bbe033341d3e58001e896bf75819a3378a02745 /bundles | |
parent | 90b8b233760d78b312fbc8bbf773ef3e0ed1ca2d (diff) | |
download | eclipse.platform.team-d436d80e17991fd39937f667a1b4f094de360a93.tar.gz eclipse.platform.team-d436d80e17991fd39937f667a1b4f094de360a93.tar.xz eclipse.platform.team-d436d80e17991fd39937f667a1b4f094de360a93.zip |
*** empty log message ***
Diffstat (limited to 'bundles')
3 files changed, 9 insertions, 31 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java index 91a0265a9..38b49ff7d 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java @@ -369,28 +369,18 @@ public class CVSProvider implements ICVSProvider { return result; } - /* - * @see ICVSProvider#importAndCheckout(IProject, Properties, IProgressMonitor) + /** + * @see ICVSProvider#createModule() */ - public void createModule(IProject project, Properties configuration, IProgressMonitor monitor) throws TeamException { - CVSRepositoryLocation location = buildRepository(configuration, false); + public void createModule(ICVSRepositoryLocation location, IProject project, String moduleName, IProgressMonitor monitor) throws TeamException { boolean alreadyExists = isCached(location); addToCache(location); try { // Get the import properties - String message = configuration.getProperty("message"); //$NON-NLS-1$ - if (message == null) - message = Policy.bind("CVSProvider.initialImport"); - String vendor = configuration.getProperty("vendor"); //$NON-NLS-1$ - if (vendor == null) - vendor = location.getUsername(); - // Get the vendor - String tag = configuration.getProperty("tag"); //$NON-NLS-1$ - if (tag == null) - tag = "start"; //$NON-NLS-1$ - // Get the module name + String message = Policy.bind("CVSProvider.initialImport"); + String vendor = location.getUsername(); + String tag = "start"; //$NON-NLS-1$ String projectName = project.getName(); - String moduleName = configuration.getProperty("module"); //$NON-NLS-1$ if (moduleName == null) moduleName = projectName; @@ -434,7 +424,7 @@ public class CVSProvider implements ICVSProvider { CVSProviderPlugin.getSynchronizer().save(project.getLocation().toFile(), Policy.subMonitorFor(monitor, 5)); } // We succeeded so we should cache the password ... - location.updateCache(); + ((CVSRepositoryLocation)location).updateCache(); // and notify listeners if the location wasn't cached before if (! alreadyExists) repositoryAdded(location); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSProvider.java index 5bdb1d2e4..1d0ee543a 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSProvider.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSProvider.java @@ -55,20 +55,8 @@ public interface ICVSProvider { * The contents of the project are not imported. * * Consideration: What if the project already exists? - * - * The supported properties are: - * connection The connection method to be used - * user The username for the connection - * password The password used for the connection (optional) - * host The host where the repository resides - * port The port to connect to (optional) - * root The server directory where the repository is located - * message The message to be attached (optional) - * vendor The vendor tag (optional) - * tag The version tag (optional) - * */ - public void createModule(IProject project, Properties configuration, IProgressMonitor monitor) throws TeamException; + public void createModule(ICVSRepositoryLocation location, IProject project, String moduleName, IProgressMonitor monitor) throws TeamException; /** * Create a repository instance from the given properties. diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java index c617cb72b..974a1e939 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java @@ -213,7 +213,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard { return; } // Create the remote module for the project - CVSProviderPlugin.getProvider().createModule(project, getProperties(), new SubProgressMonitor(monitor, 50)); + CVSProviderPlugin.getProvider().createModule(location, project, getModuleName(), new SubProgressMonitor(monitor, 50)); } CVSDecorator.refresh(project); } catch (TeamException e) { |