diff options
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java | 16 |
1 files changed, 1 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 13eb65a0d..77fad2e42 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 @@ -167,23 +167,9 @@ 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) - - // XXX The following workaround is required to ensure that the provider nature is set. - // The reasoning is as followings - // - if there is a vcm_meta, then the nature is set by the ProjectDescriptionManager - // - if there is a managed .project file, it shoudl contain the provider nature which - // will be read after the operation ends - // - if neither of the above is true, we can set the nature - // The workaround should be removed when the .project file updates result in immediate - // update of the project description - IFile vcm_meta = project.getFile(".vcm_meta"); - ICVSFile project_meta = CVSWorkspaceRoot.getCVSFileFor(project.getFile(".project")); - if ( ! vcm_meta.exists() && ! project_meta.isManaged()) { + if (!project.getDescription().hasNature(CVSProviderPlugin.getTypeId())) { Team.addNatureToProject(project, CVSProviderPlugin.getTypeId(), Policy.subMonitorFor(monitor, 100)); } -// if (!project.getDescription().hasNature(CVSProviderPlugin.getTypeId())) { -// TeamPlugin.addNatureToProject(project, CVSProviderPlugin.getTypeId(), Policy.subMonitorFor(monitor, 100)); -// } } } finally { |