Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-10-25 20:05:24 +0000
committerMichael Valenta2004-10-25 20:05:24 +0000
commit3baa0f45b106227fa02977d8141259a396ef72dd (patch)
tree0ac8c7160fca897ef1d6a8de89ae5c8624223553
parent27f74d31025673fb4c0853ebd07b44cc97e53aa4 (diff)
downloadeclipse.platform.team-3baa0f45b106227fa02977d8141259a396ef72dd.tar.gz
eclipse.platform.team-3baa0f45b106227fa02977d8141259a396ef72dd.tar.xz
eclipse.platform.team-3baa0f45b106227fa02977d8141259a396ef72dd.zip
Changed path constructor used since we don't have a device in most cases
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ActiveChangeSet.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java8
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java6
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java6
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java4
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch43
36 files changed, 90 insertions, 83 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ActiveChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ActiveChangeSet.java
index e4a02c391..6c44c292f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ActiveChangeSet.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ActiveChangeSet.java
@@ -175,7 +175,7 @@ public class ActiveChangeSet extends ChangeSet {
IResource resource = root.findMember(next);
if (resource == null) {
// May be an outgoing deletion
- Path path = new Path(next);
+ Path path = new Path(null, next);
if (next.charAt(next.length()-1) == Path.SEPARATOR) {
if (path.segmentCount() == 1) {
// resource is a project
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java
index a1e047bd2..94005804c 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java
@@ -339,7 +339,7 @@ public class SyncInfoTree extends SyncInfoSet {
modelObject = element;
} else if (childPath.segmentCount() > path.segmentCount()) {
- IContainer childFolder = parent.getFolder(new Path(childPath.segment(path.segmentCount())));
+ IContainer childFolder = parent.getFolder(new Path(null, childPath.segment(path.segmentCount())));
modelObject = childFolder;
}
if (modelObject != null) {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
index f09ff0f9a..3bda82ad3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
@@ -263,9 +263,9 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre
return null;
}
if (isContainer) {
- return ((IContainer) parent).getFolder(new Path(childName));
+ return ((IContainer) parent).getFolder(new Path(null, childName));
} else {
- return ((IContainer) parent).getFile(new Path(childName));
+ return ((IContainer) parent).getFile(new Path(null, childName));
}
}
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java
index 04afc76af..86c3583f6 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java
@@ -276,7 +276,7 @@ public abstract class CachedResourceVariant extends PlatformObject implements IR
* @since 3.1
*/
public IPath getDisplayPath() {
- return new Path(getCachePath());
+ return new Path(null, getCachePath());
}
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java
index 9ff5796f7..5da4877a2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java
@@ -366,7 +366,7 @@ public class CVSProjectSetCapability extends ProjectSetCapability {
// Convert the module expansions to local projects
String[] expansions = session.getModuleExpansions();
for (int j = 0; j < expansions.length; j++) {
- targetProjects.add(ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(expansions[j]).segment(0)));
+ targetProjects.add(ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(null, expansions[j]).segment(0)));
}
} else {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
index 741a884a2..465b7b754 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
@@ -48,7 +48,7 @@ public class NotifiedHandler extends ResponseHandler {
// clear the notify info for the file
ICVSFolder folder = session.getLocalRoot().getFolder(localDir);
- ICVSFile file = folder.getFile(new Path(repositoryFilePath).lastSegment());
+ ICVSFile file = folder.getFile(new Path(null, repositoryFilePath).lastSegment());
file.notificationCompleted();
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java
index 798e37efd..479034e97 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AdminKSubstListener.java
@@ -45,7 +45,7 @@ public class AdminKSubstListener extends CommandOutputListener {
return new CVSStatus(CVSStatus.ERROR,
Policy.bind("AdminKSubstListener.expectedRCSFile", rcsFile)); //$NON-NLS-1$
}
- IPath rcsFilePath = new Path(rcsFile.substring(0, rcsFile.length() - 2));
+ IPath rcsFilePath = new Path(null, rcsFile.substring(0, rcsFile.length() - 2));
try {
ICVSFile file = findLocalFileFor(commandRoot, rcsFilePath);
//ResourceSyncInfo info = file.getSyncInfo();
@@ -70,7 +70,7 @@ public class AdminKSubstListener extends CommandOutputListener {
throw new CVSException(new CVSStatus(CVSStatus.ERROR,
Policy.bind("AdminKSubstListener.commandRootNotManaged"))); //$NON-NLS-1$
}
- IPath remoteRootPath = new Path(remoteRootLocation);
+ IPath remoteRootPath = new Path(null, remoteRootLocation);
if (remoteRootPath.isPrefixOf(rcsFilePath)) {
IPath relativeFilePath = rcsFilePath.removeFirstSegments(remoteRootPath.segmentCount());
ICVSFile file = commandRoot.getFile(relativeFilePath.toString());
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
index 2d0c42ed6..698028300 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
@@ -694,7 +694,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
* @see ICVSRepositoryLocation#getRemoteFile(String, CVSTag)
*/
public ICVSRemoteFile getRemoteFile(String remotePath, CVSTag tag) {
- IPath path = new Path(remotePath);
+ IPath path = new Path(null, remotePath);
RemoteFolderTree remoteFolder = new RemoteFolderTree(null, this, path.removeLastSegments(1).toString(), tag);
RemoteFile remoteFile = new RemoteFile(remoteFolder, Update.STATE_ADDED_LOCAL, path.lastSegment(), null, null, tag);
remoteFolder.setChildren(new ICVSRemoteResource[] { remoteFile });
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
index e1ef3b3f6..c4c7431e0 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
@@ -72,11 +72,11 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
public ICVSFolder getFolder(String name) throws CVSException {
if ((CURRENT_LOCAL_FOLDER.equals(name)) || ((CURRENT_LOCAL_FOLDER + SEPARATOR).equals(name)))
return this;
- IPath path = new Path(name);
+ IPath path = new Path(null, name);
if(resource.getType()==IResource.ROOT && path.segmentCount()==1) {
return new EclipseFolder(((IWorkspaceRoot)resource).getProject(name));
} else {
- return new EclipseFolder(((IContainer)resource).getFolder(new Path(name)));
+ return new EclipseFolder(((IContainer)resource).getFolder(path));
}
}
@@ -84,7 +84,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
* @see ICVSFolder#createFile(String)
*/
public ICVSFile getFile(String name) throws CVSException {
- return new EclipseFile(((IContainer)resource).getFile(new Path(name)));
+ return new EclipseFile(((IContainer)resource).getFile(new Path(null, name)));
}
/**
@@ -264,7 +264,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) {
return this;
}
- IPath path = new Path(namedPath);
+ IPath path = new Path(null, namedPath);
if(path.segmentCount()==0) {
return this;
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
index 39c7ac55c..ecff82be7 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
@@ -784,7 +784,7 @@ public class EclipseSynchronizer implements IFlushOperation {
if (infos != null) {
for (int i = 0; i < infos.length; i++) {
byte[] syncBytes = infos[i];
- IPath name = new Path(getName(syncBytes));
+ IPath name = new Path(null, getName(syncBytes));
IResource resource;
if (isFolder(syncBytes)) {
resource = container.getFolder(name);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
index 496d692ad..9c314ade3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
@@ -338,7 +338,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
if (path.equals(Session.CURRENT_LOCAL_FOLDER) || path.length() == 0)
return this;
if (path.indexOf(Session.SERVER_SEPARATOR) != -1) {
- IPath p = new Path(path);
+ IPath p = new Path(null, path);
try {
return ((RemoteFolder)getChild(p.segment(0))).getChild(p.removeFirstSegments(1).toString());
} catch (CVSException e) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
index 659eb46ac..0957bc110 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
@@ -170,7 +170,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
*/
public void directoryInformation(ICVSFolder commandRoot, String stringPath, boolean newDirectory) {
try {
- IPath path = this.parentFolder.getRelativePathFromRootRelativePath(commandRoot, new Path(stringPath));
+ IPath path = this.parentFolder.getRelativePathFromRootRelativePath(commandRoot, new Path(null, stringPath));
if (path.segmentCount() == 1) {
String pathName = path.lastSegment();
if (!pathName.equals(".")) { //$NON-NLS-1$
@@ -187,7 +187,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
*/
public void directoryDoesNotExist(ICVSFolder parent, String stringPath) {
try {
- IPath path = this.parentFolder.getRelativePathFromRootRelativePath(parent, new Path(stringPath));
+ IPath path = this.parentFolder.getRelativePathFromRootRelativePath(parent, new Path(null, stringPath));
if (path.isEmpty()) {
parentDoesNotExist();
}
@@ -201,7 +201,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
*/
public void fileInformation(int type, ICVSFolder parent, String filename) {
try {
- IPath filePath = new Path(filename);
+ IPath filePath = new Path(null, filename);
filePath = this.parentFolder.getRelativePathFromRootRelativePath(parent, filePath);
if( filePath.segmentCount() == 1 ) {
String properFilename = filePath.lastSegment();
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java
index 859925a73..ec103d092 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java
@@ -41,7 +41,7 @@ public class RemoteFolderSandbox extends RemoteFolder {
return super.getFile(name);
} catch (CVSException e) {
if (e.getStatus().getCode() == CHILD_DOES_NOT_EXIST) {
- IPath path = new Path(name);
+ IPath path = new Path(null, name);
String fileName = path.lastSegment();
RemoteFolderSandbox parent = getFolder(path);
RemoteFile file = new RemoteFile(parent, Update.STATE_NONE, fileName, null, null, getTag());
@@ -80,9 +80,9 @@ public class RemoteFolderSandbox extends RemoteFolder {
return super.getFolder(name);
} catch (CVSException e) {
if (e.getStatus().getCode() == CHILD_DOES_NOT_EXIST) {
- IPath path = new Path(name);
+ IPath path = new Path(null, name);
RemoteFolderSandbox parent = getFolder(path);
- String repoPath = new Path(getRepositoryRelativePath()).append(name).removeTrailingSeparator().toString();
+ String repoPath = new Path(null, getRepositoryRelativePath()).append(name).removeTrailingSeparator().toString();
RemoteFolderSandbox folder = new RemoteFolderSandbox(parent, getRepository(), repoPath, getTag());
parent.addChild(folder);
return folder;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
index b924aef97..d4b6f8f13 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
@@ -185,7 +185,7 @@ public class RemoteModule extends RemoteFolder {
// XXX Unsupported for now
expandable = false;
} else {
- IPath path = new Path(expansion[i]);
+ IPath path = new Path(null, expansion[i]);
if (path.segmentCount() > 1) {
// XXX Unsupported for now
expandable = false;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
index e97c337d8..ba071e467 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
@@ -215,7 +215,7 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
*/
public String getCachePath() {
ICVSRepositoryLocation location = getRepository();
- IPath path = new Path(location.getHost());
+ IPath path = new Path(null, location.getHost());
path = path.append(location.getRootDirectory());
path = path.append(parent.getRepositoryRelativePath());
path = path.append(getName() + ' ' + getContentIdentifier());
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java
index 9f0274232..b23fe4659 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java
@@ -581,7 +581,7 @@ public class SyncFileWriter {
if (!baseFolder.exists()) {
baseFolder.create(false /* force */, true /* local */, Policy.subMonitorFor(monitor, 10));
}
- IFile target = baseFolder.getFile(new Path(file.getName()));
+ IFile target = baseFolder.getFile(new Path(null, file.getName()));
if (target.exists()) {
// XXX Should ensure that we haven't already copied it
// XXX write the revision to the CVS/Baserev file
@@ -609,7 +609,7 @@ public class SyncFileWriter {
monitor.beginTask(null, 100);
try {
IFolder baseFolder = getBaseDirectory(file);
- IFile source = baseFolder.getFile(new Path(file.getName()));
+ IFile source = baseFolder.getFile(new Path(null, file.getName()));
if (!source.exists()) {
throw new CVSException(Policy.bind("SyncFileWriter.baseNotAvailable", file.getFullPath().toString())); //$NON-NLS-1$
}
@@ -635,7 +635,7 @@ public class SyncFileWriter {
monitor.beginTask(null, 100);
try {
IFolder baseFolder = getBaseDirectory(file);
- IFile source = baseFolder.getFile(new Path(file.getName()));
+ IFile source = baseFolder.getFile(new Path(null, file.getName()));
if (source.exists()) {
if (source.isReadOnly()) {
source.setReadOnly(false);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java
index cd1edfe4b..537a367c7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java
@@ -57,7 +57,7 @@ public class AdaptableHierarchicalResourceList extends AdaptableResourceList {
if (parentRelativePath.segmentCount() == 1) {
children.add(resource);
} else if (parentRelativePath.segmentCount() > 1) {
- children.add(parent.getFolder(new Path(parentRelativePath.segment(0))));
+ children.add(parent.getFolder(new Path(null, parentRelativePath.segment(0))));
}
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java
index de9e58460..fdbc38ab3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteAnnotationStorage.java
@@ -65,7 +65,7 @@ public class RemoteAnnotationStorage extends PlatformObject implements IEncodedS
public IPath getFullPath() {
ICVSRepositoryLocation location = file.getRepository();
- IPath path = new Path(location.getRootDirectory());
+ IPath path = new Path(null, location.getRootDirectory());
path = path.setDevice(location.getHost() + Path.DEVICE_SEPARATOR);
path = path.append(file.getRepositoryRelativePath());
return path;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java
index fafc65b99..14412b245 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteFileEditorInput.java
@@ -119,7 +119,7 @@ public class RemoteFileEditorInput implements IWorkbenchAdapter, IStorageEditorI
public String getFullPath() {
//use path to make sure slashes are correct
ICVSRepositoryLocation location = file.getRepository();
- IPath path = new Path(location.getRootDirectory());
+ IPath path = new Path(null, location.getRootDirectory());
path = path.setDevice(location.getHost() + Path.DEVICE_SEPARATOR);
path = path.append(file.getRepositoryRelativePath());
String fullPath;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
index 5436bd7a3..d746d5eb9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
@@ -526,7 +526,7 @@ public class TagConfigurationDialog extends Dialog {
try {
ICVSFile file = ((CVSFileElement)it.next()).getCVSFile();
ICVSFolder fileParent = file.getParent();
- String filePath = new Path(fileParent.getFolderSyncInfo().getRepository())
+ String filePath = new Path(null, fileParent.getFolderSyncInfo().getRepository())
.append(file.getRelativePath(fileParent)).toString();
if(autoRefreshFileList.indexOf(filePath)==-1) {
autoRefreshFileList.add(filePath);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
index 691d92b3a..314aaef32 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
@@ -49,7 +49,7 @@ public class ConfigureTagsFromRepoViewOnFolder extends CVSAction {
ICVSRemoteFolder folder = (ICVSRemoteFolder)next;
if (folder.isDefinedModule()) {
resources.add(next);
- } else if(new Path(((ICVSRemoteFolder)next).getRepositoryRelativePath()).segmentCount()==1) {
+ } else if(new Path(null, ((ICVSRemoteFolder)next).getRepositoryRelativePath()).segmentCount()==1) {
resources.add(next);
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
index effe92a24..6a3433720 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
@@ -147,7 +147,7 @@ public class CheckoutIntoOperation extends CheckoutOperation {
// Convert the module expansions to target folders
String[] expansions = session.getModuleExpansions();
for (int j = 0; j < expansions.length; j++) {
- String childPath = new Path(expansions[j]).segment(0);
+ String childPath = new Path(null, expansions[j]).segment(0);
ICVSResource resource = parentFolder.getChild(childPath);
if (resource != null && !resource.isFolder()) {
// The target folder conflicts with an existing file
@@ -221,8 +221,8 @@ public class CheckoutIntoOperation extends CheckoutOperation {
if (localInfo == null) return false;
FolderSyncInfo parentInfo = targetFolder.getParent().getFolderSyncInfo();
if (parentInfo == null) return false;
- IPath childPath = new Path(localInfo.getRepository());
- IPath parentPath = new Path(parentInfo.getRepository());
+ IPath childPath = new Path(null, localInfo.getRepository());
+ IPath parentPath = new Path(null, parentInfo.getRepository());
return parentPath.isPrefixOf(childPath);
}
@@ -329,7 +329,7 @@ public class CheckoutIntoOperation extends CheckoutOperation {
// Determine which local folders will be affected
String localName = localFolderName;
if (localName == null) {
- IPath path = new Path(remoteFolder.getRepositoryRelativePath());
+ IPath path = new Path(null, remoteFolder.getRepositoryRelativePath());
if (path.segmentCount() > 1) {
localName = path.lastSegment();
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java
index 0a05a2a89..3fc09d18d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java
@@ -119,7 +119,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation {
// Check to see if the entire repo is being checked out.
if (project == null && resource.getName().equals(".")) { //$NON-NLS-1$
// No project was specified but we need on for this to work
- String name = new Path(resource.getRepository().getRootDirectory()).lastSegment();
+ String name = new Path(null, resource.getRepository().getRootDirectory()).lastSegment();
project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
}
@@ -217,7 +217,7 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation {
// we will want to flatten the directory structure
String path = resource.getRepositoryRelativePath();
if (!path.equals(FolderSyncInfo.VIRTUAL_DIRECTORY)
- && new Path(path).segmentCount() > 1) {
+ && new Path(null, path).segmentCount() > 1) {
project = targetProjects[0];
}
}
@@ -284,11 +284,11 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation {
String[] expansions = session.getModuleExpansions();
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(expansions[0]).lastSegment();
+ String lastSegment = new Path(null, expansions[0]).lastSegment();
targetProjectSet.add(ResourcesPlugin.getWorkspace().getRoot().getProject(lastSegment));
} else {
for (int j = 0; j < expansions.length; j++) {
- targetProjectSet.add(ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(expansions[j]).segment(0)));
+ targetProjectSet.add(ResourcesPlugin.getWorkspace().getRoot().getProject(new Path(null, expansions[j]).segment(0)));
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java
index d237d9344..875b30376 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java
@@ -148,9 +148,9 @@ public class ReconcileProjectOperation extends ShareProjectOperation {
IResource resource = parent.findMember(member.getName());
if (resource == null) {
if (member.isContainer()) {
- resource = parent.getFolder(new Path(member.getName()));
+ resource = parent.getFolder(new Path(null, member.getName()));
} else {
- resource = parent.getFile(new Path(member.getName()));
+ resource = parent.getFile(new Path(null, member.getName()));
}
}
return resource;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
index 1ed1f7bb6..3c5fb84ff 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
@@ -104,7 +104,7 @@ public class RemoteCompareOperation extends RemoteOperation {
public void addToTrees(ICVSRemoteFile predecessor, ICVSRemoteFile remote) {
if (remote != null) {
try {
- Path filePath = new Path(remote.getRepositoryRelativePath());
+ Path filePath = new Path(null, remote.getRepositoryRelativePath());
addFile(rightTree, right, filePath, remote.getRevision());
getFolder(leftTree, left, filePath.removeLastSegments(1), Path.EMPTY);
} catch (TeamException e) {
@@ -113,7 +113,7 @@ public class RemoteCompareOperation extends RemoteOperation {
}
if (predecessor != null) {
try {
- Path filePath = new Path(predecessor.getRepositoryRelativePath());
+ Path filePath = new Path(null, predecessor.getRepositoryRelativePath());
addFile(leftTree, left, filePath, predecessor.getRevision());
getFolder(rightTree, right, filePath.removeLastSegments(1), Path.EMPTY);
} catch (TeamException e) {
@@ -172,12 +172,12 @@ public class RemoteCompareOperation extends RemoteOperation {
*/
public void fileDiff(String remoteFilePath, String leftRevision, String rightRevision) {
try {
- addFile(rightTree, right, new Path(remoteFilePath), rightRevision);
+ addFile(rightTree, right, new Path(null, remoteFilePath), rightRevision);
} catch (CVSException e) {
CVSUIPlugin.log(e);
}
try {
- addFile(leftTree, left, new Path(remoteFilePath), leftRevision);
+ addFile(leftTree, left, new Path(null, remoteFilePath), leftRevision);
} catch (CVSException e) {
CVSUIPlugin.log(e);
}
@@ -188,7 +188,7 @@ public class RemoteCompareOperation extends RemoteOperation {
*/
public void newFile(String remoteFilePath, String rightRevision) {
try {
- addFile(rightTree, right, new Path(remoteFilePath), rightRevision);
+ addFile(rightTree, right, new Path(null, remoteFilePath), rightRevision);
} catch (CVSException e) {
CVSUIPlugin.log(e);
}
@@ -200,7 +200,7 @@ public class RemoteCompareOperation extends RemoteOperation {
public void deletedFile(String remoteFilePath, String leftRevision) {
// The leftRevision may be null in which case the tag is used
try {
- addFile(leftTree, left, new Path(remoteFilePath), leftRevision);
+ addFile(leftTree, left, new Path(null, remoteFilePath), leftRevision);
} catch (CVSException e) {
CVSUIPlugin.log(e);
}
@@ -211,12 +211,12 @@ public class RemoteCompareOperation extends RemoteOperation {
*/
public void directory(String remoteFolderPath) {
try {
- getFolder(leftTree, left, new Path(remoteFolderPath), Path.EMPTY);
+ getFolder(leftTree, left, new Path(null, remoteFolderPath), Path.EMPTY);
} catch (CVSException e) {
CVSUIPlugin.log(e);
}
try {
- getFolder(rightTree, right, new Path(remoteFolderPath), Path.EMPTY);
+ getFolder(rightTree, right, new Path(null, remoteFolderPath), Path.EMPTY);
} catch (CVSException e) {
CVSUIPlugin.log(e);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java
index 59defecca..dae747075 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java
@@ -84,7 +84,7 @@ public class ShareProjectOperation extends CVSOperation {
moduleName = projectName;
RemoteFolderTree root = new RemoteFolderTree(null, location, Path.EMPTY.toString(), null);
- Path path = new Path(moduleName);
+ Path path = new Path(null, moduleName);
try {
monitor.beginTask(getTaskName(), 100 * path.segmentCount());
@@ -120,7 +120,7 @@ public class ShareProjectOperation extends CVSOperation {
* Create handles for all the children in the moduleName path
*/
private RemoteFolderTree createChild(RemoteFolderTree parent, String name, IProgressMonitor monitor) throws CVSException, TeamException {
- RemoteFolderTree child = new RemoteFolderTree(parent, name, location, new Path(parent.getRepositoryRelativePath()).append(name).toString(), null);
+ RemoteFolderTree child = new RemoteFolderTree(parent, name, location, new Path(null, parent.getRepositoryRelativePath()).append(name).toString(), null);
parent.setChildren(new ICVSRemoteResource[] { child });
if (child.exists(Policy.subMonitorFor(monitor, 50))) {
// The child exists so get the handle that was received from the server
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java
index 4c513f624..be3b44f37 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java
@@ -82,7 +82,7 @@ public class AddToBranchAction extends CVSAction {
ICVSRemoteFolder selectedFolder = null;
for (int i = 0; i < folders.length; i++) {
ICVSRemoteFolder folder = folders[i];
- if (folder.isDefinedModule() || new Path(folder.getRepositoryRelativePath()).segmentCount()==1) {
+ if (folder.isDefinedModule() || new Path(null, folder.getRepositoryRelativePath()).segmentCount()==1) {
// only return a folder if one valid one is selected.
if (selectedFolder != null) return null;
selectedFolder = folder;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
index 995c51443..95e92a440 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
@@ -192,7 +192,7 @@ public class RepositoriesViewContentHandler extends DefaultHandler {
if (RepositoryRoot.isDefinedModuleName(currentRemotePath)) {
path = null;
} else {
- path = new Path(currentRemotePath).append(path).toString();
+ path = new Path(null, currentRemotePath).append(path).toString();
}
}
if (path != null) autoRefreshFiles.add(path);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java
index 8d59c29a6..37e946dc1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java
@@ -135,7 +135,7 @@ public class RepositoryRoot extends PlatformObject {
FolderSyncInfo info = resource.getParent().getFolderSyncInfo();
if (info == null)
throw new CVSException(Policy.bind("RepositoryRoot.folderInfoMissing", resource.getParent().getName())); //$NON-NLS-1$
- String path = new Path(info.getRepository()).append(resource.getName()).toString();
+ String path = new Path(null, info.getRepository()).append(resource.getName()).toString();
return path;
}
}
@@ -266,7 +266,7 @@ public class RepositoryRoot extends PlatformObject {
List result = new ArrayList();
for (int i = 0; i < DEFAULT_AUTO_REFRESH_FILES.length; i++) {
String relativePath = DEFAULT_AUTO_REFRESH_FILES[i];
- result.add(new Path(remotePath).append(relativePath).toString());
+ result.add(new Path(null, remotePath).append(relativePath).toString());
}
return (String[]) result.toArray(new String[result.size()]);
} else {
@@ -287,7 +287,7 @@ public class RepositoryRoot extends PlatformObject {
boolean isDefault = true;
for (int i = 0; i < DEFAULT_AUTO_REFRESH_FILES.length; i++) {
String filePath = DEFAULT_AUTO_REFRESH_FILES[i];
- if (!newFiles.contains(new Path(remotePath).append(filePath).toString())) {
+ if (!newFiles.contains(new Path(null, remotePath).append(filePath).toString())) {
isDefault = false;
break;
}
@@ -347,7 +347,7 @@ public class RepositoryRoot extends PlatformObject {
}
private String getCachePathFor(String remotePath) {
- String root = new Path(remotePath).segment(0);
+ String root = new Path(null, remotePath).segment(0);
if (isDefinedModuleName(remotePath)) {
return asDefinedModulePath(root);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
index 8c08d7605..573237698 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
@@ -88,7 +88,7 @@ public class CheckoutAsMainPage extends CVSWizardPage {
private String getFolderName() {
String name = folders[0].getName();
if (name .equals(".")) { //$NON-NLS-1$
- name = new Path(folders[0].getRepository().getRootDirectory()).lastSegment();
+ name = new Path(null, folders[0].getRepository().getRootDirectory()).lastSegment();
}
return name;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
index 6b2e846e5..b50f34f34 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
@@ -246,7 +246,7 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage {
public IContainer getLocalFolder() {
if (Path.EMPTY.isValidSegment(folderName)) {
- return ((IContainer)getSelection()).getFolder(new Path(folderName));
+ return ((IContainer)getSelection()).getFolder(new Path(null, folderName));
} else {
return null;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
index e7cd605e8..c694a3dfb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardMainPage.java
@@ -591,7 +591,7 @@ public class ConfigurationWizardMainPage extends CVSWizardPage {
if (pathString.length() == 0) {
return new Status(IStatus.ERROR, CVSUIPlugin.ID, REQUIRED_FIELD, Policy.bind("ConfigurationWizardMainPage.4"), null); //$NON-NLS-1$
}
- IPath path = new Path(pathString);
+ IPath path = new Path(null, pathString);
String[] segments = path.segments();
for (int i = 0; i < segments.length; i++) {
String string = segments[i];
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
index 6cbc03f54..b537c83d0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
@@ -223,7 +223,7 @@ public class GenerateDiffFileWizard extends Wizard {
public IResource getResource() {
if (pageValid && selectedLocation == WORKSPACE) {
final String filename= wsFilenameText.getText().trim();
- return wsSelectedContainer.getFile(new Path(filename));
+ return wsSelectedContainer.getFile(new Path(null, filename));
}
return null;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
index 11ddd3908..d085b60e7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
@@ -398,7 +398,7 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage {
ICVSFolder parent = CVSWorkspaceRoot.getCVSFolderFor(file.getParent());
FolderSyncInfo info = parent.getFolderSyncInfo();
ICVSRepositoryLocation location = KnownRepositories.getInstance().getRepository(info.getRoot());
- final ICVSRemoteFile remoteFile = location.getRemoteFile(new Path(info.getRepository()).append(file.getName()).toString(), CVSTag.DEFAULT);
+ final ICVSRemoteFile remoteFile = location.getRemoteFile(new Path(null, info.getRepository()).append(file.getName()).toString(), CVSTag.DEFAULT);
// Then we need to fetch the log entries
getContainer().run(true, true, new IRunnableWithProgress() {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
index d7d0406ac..8d9fbbf99 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
@@ -535,9 +535,9 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
// but may still appear in the view so try to deduce the type
// from the path
if (path.endsWith(Character.toString(Path.SEPARATOR))) {
- resource = container.getFolder(new Path(path));
+ resource = container.getFolder(new Path(null, path));
} else {
- resource = container.getFile(new Path(path));
+ resource = container.getFile(new Path(null, path));
}
}
return resource;
diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch
index ec3eeea25..2ec10e51e 100644
--- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch
+++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="clearws" value="true"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
-<booleanAttribute key="tracing" value="false"/>
-<stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
+<booleanAttribute key="useProduct" value="false"/>
+<booleanAttribute key="tracing" value="true"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
-<stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="clearConfig" value="true"/>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<mapAttribute key="tracingOptions">
<mapEntry key="org.eclipse.core.boot/monitor/classes" value="false"/>
@@ -59,19 +55,19 @@
<mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/>
<mapEntry key="org.eclipse.jface/trace/actions" value="false"/>
<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
<mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/>
+<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
@@ -81,15 +77,15 @@
<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/>
<mapEntry key="org.eclipse.team.ftp/list" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
<mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
@@ -97,13 +93,13 @@
<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
<mapEntry key="org.eclipse.team.core/debug" value="false"/>
+<mapEntry key="org.eclipse.team.ftp/responses" value="true"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
<mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/>
@@ -129,8 +125,8 @@
<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.jdt.debug/debug" value="true"/>
<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
@@ -142,12 +138,23 @@
<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
</mapAttribute>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="includeFragments" value="false"/>
+<booleanAttribute key="clearws" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
+<stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
+<stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="onePluginID" value=""/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="onePlugin" value="false"/>

Back to the top