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 | 24 |
1 files changed, 8 insertions, 16 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 824d4dd99..fa0f1f90e 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 @@ -33,10 +33,12 @@ 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; import org.eclipse.team.ccvs.core.ICVSRemoteFolder; @@ -56,7 +58,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; import org.eclipse.team.internal.ccvs.core.client.Command.QuietOption; import org.eclipse.team.internal.ccvs.core.connection.CVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.connection.CVSServerException; -import org.eclipse.team.internal.ccvs.core.resources.ICVSFolder; +import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolderTree; import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo; @@ -116,7 +118,7 @@ public class CVSProvider implements ICVSProvider { project = ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(sourceModule).lastSegment()); // Get the location of the workspace root - ICVSFolder root = Session.getManagedFolder(ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile()); + ICVSFolder root = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(project.getParent()); // Build the local options List localOptions = new ArrayList(); @@ -331,17 +333,7 @@ public class CVSProvider implements ICVSProvider { } - /** - * Get the print stream to which information from CVS commands - * is sent. - */ - public PrintStream getPrintStream() { - if (printStream == null) - return System.out; - else - return printStream; - } - + /** * @see ICVSProvider#getRepository(String) */ @@ -401,7 +393,7 @@ public class CVSProvider implements ICVSProvider { } // Set the folder sync info of the project to point to the remote module - ICVSFolder folder = (ICVSFolder)Session.getManagedResource(project); + ICVSFolder folder = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(project); folder.setFolderSyncInfo(new FolderSyncInfo(moduleName, location.getLocation(), null, false)); // Register the project with Team @@ -470,7 +462,7 @@ public class CVSProvider implements ICVSProvider { public void setSharing(IProject project, FolderSyncInfo info, IProgressMonitor monitor) throws TeamException { // Ensure provided info matches that of the project - ICVSFolder folder = (ICVSFolder)Session.getManagedResource(project); + ICVSFolder folder = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(project); FolderSyncInfo folderInfo = folder.getFolderSyncInfo(); if ( ! info.equals(folderInfo)) { throw new CVSException(new CVSStatus(CVSStatus.ERROR, Policy.bind("CVSProvider.infoMismatch", project.getName())));//$NON-NLS-1$ @@ -539,7 +531,7 @@ public class CVSProvider implements ICVSProvider { ITeamProvider provider = manager.getProvider(projects[i]); if (provider instanceof CVSTeamProvider) { CVSTeamProvider cvsProvider = (CVSTeamProvider)provider; - ICVSFolder folder = (ICVSFolder)Session.getManagedResource(projects[i]); + ICVSFolder folder = (ICVSFolder)CVSWorkspaceRoot.getCVSResourceFor(projects[i]); FolderSyncInfo info = folder.getFolderSyncInfo(); if (info != null) { ICVSRepositoryLocation result = getRepository(info.getRoot()); |