diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java | 25 |
1 files changed, 10 insertions, 15 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 7242e206e..c72db56e1 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 @@ -24,7 +24,6 @@ import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -33,11 +32,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.team.ccvs.core.*; import org.eclipse.team.ccvs.core.CVSProviderPlugin; import org.eclipse.team.ccvs.core.CVSStatus; import org.eclipse.team.ccvs.core.CVSTag; -import org.eclipse.team.ccvs.core.CVSTeamProvider; import org.eclipse.team.ccvs.core.ICVSFolder; import org.eclipse.team.ccvs.core.ICVSListener; import org.eclipse.team.ccvs.core.ICVSProvider; @@ -45,8 +42,8 @@ import org.eclipse.team.ccvs.core.ICVSRemoteFolder; import org.eclipse.team.ccvs.core.ICVSRepositoryLocation; import org.eclipse.team.ccvs.core.IConnectionMethod; import org.eclipse.team.core.IFileTypeRegistry; -import org.eclipse.team.core.ITeamManager; -import org.eclipse.team.core.ITeamProvider; +import org.eclipse.team.core.RepositoryProvider; +import org.eclipse.team.core.RepositoryProviderType; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.TeamPlugin; import org.eclipse.team.internal.ccvs.core.client.Checkout; @@ -166,8 +163,8 @@ public class CVSProvider implements ICVSProvider { IProject project = projects[i]; // Register the project with Team // (unless the project already has the proper nature from the project meta-information) - if (!project.getDescription().hasNature(CVSProviderPlugin.NATURE_ID)) { - TeamPlugin.getManager().setProvider(project, CVSProviderPlugin.NATURE_ID, null, Policy.subMonitorFor(monitor, 10)); + if (!project.getDescription().hasNature(CVSProviderPlugin.getTypeId())) { + TeamPlugin.addNatureToProject(project, CVSProviderPlugin.getTypeId(), Policy.subMonitorFor(monitor, 100)); } } @@ -460,8 +457,8 @@ public class CVSProvider implements ICVSProvider { // Register the project with Team // (unless the project already has the proper nature from the project meta-information) try { - if (!project.getDescription().hasNature(CVSProviderPlugin.NATURE_ID)) { - TeamPlugin.getManager().setProvider(project, CVSProviderPlugin.NATURE_ID, null, Policy.subMonitorFor(monitor, 1)); + if (!project.getDescription().hasNature(CVSProviderPlugin.getTypeId())) { + TeamPlugin.addNatureToProject(project, CVSProviderPlugin.getTypeId(), Policy.subMonitorFor(monitor, 1)); } } catch (CoreException e) { throw wrapException(e); @@ -537,8 +534,8 @@ public class CVSProvider implements ICVSProvider { // Register the project with Team // (unless the project already has the proper nature from the project meta-information) try { - if (!project.getDescription().hasNature(CVSProviderPlugin.NATURE_ID)) - TeamPlugin.getManager().setProvider(project, CVSProviderPlugin.NATURE_ID, null, monitor); + if (!project.getDescription().hasNature(CVSProviderPlugin.getTypeId())) + TeamPlugin.addNatureToProject(project, CVSProviderPlugin.getTypeId(), monitor); } catch (CoreException e) { throw wrapException(e); } @@ -583,11 +580,9 @@ public class CVSProvider implements ICVSProvider { // If the file did not exist, then prime the list of repositories with // the providers with which the projects in the workspace are shared. IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - ITeamManager manager = TeamPlugin.getManager(); for (int i = 0; i < projects.length; i++) { - ITeamProvider provider = manager.getProvider(projects[i]); - if (provider instanceof CVSTeamProvider) { - CVSTeamProvider cvsProvider = (CVSTeamProvider)provider; + RepositoryProvider provider = RepositoryProviderType.getProvider(projects[i]); + if (provider!=null && provider.isOfType(CVSProviderPlugin.getTypeId())) { ICVSFolder folder = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(projects[i]); FolderSyncInfo info = folder.getFolderSyncInfo(); if (info != null) { |