Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-02-04 15:51:53 -0500
committerMichael Valenta2005-02-04 15:51:53 -0500
commitca31ebc3be9672070cd45af1152c217b33ec26cc (patch)
treea97f37a354016dea1556fda3b046043d6d5e2679
parent2379fe026923dc5b48ea5eaa195747a84283ad31 (diff)
downloadeclipse.platform.team-ca31ebc3be9672070cd45af1152c217b33ec26cc.tar.gz
eclipse.platform.team-ca31ebc3be9672070cd45af1152c217b33ec26cc.tar.xz
eclipse.platform.team-ca31ebc3be9672070cd45af1152c217b33ec26cc.zip
Merged latest from HEADbranch_traversals_20040920
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/IFileContentManager.java8
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ChangeSet.java7
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ISubscriberChangeEvent.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java3
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeSetCollector.java9
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java1
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariant.java1
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariantComparator.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantByteStore.java4
-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/CVSTeamProvider.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java3
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/Connection.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/RemoteModule.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java14
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java13
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java48
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java26
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java1
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch22
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java2
46 files changed, 158 insertions, 102 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IFileContentManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IFileContentManager.java
index 77b6c9a48..a3ef7a5d3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IFileContentManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IFileContentManager.java
@@ -38,7 +38,7 @@ import org.eclipse.core.resources.IStorage;
* If the user-defined mapping is deleted, the plugin-contributed mapping is valid again.
* This interface is not intented to be implemented by clients.
*
- * @see org.eclipse.team.core.Team.getFileContentManager()
+ * @see org.eclipse.team.core.Team#getFileContentManager()
*
* @since 3.1
*/
@@ -87,7 +87,7 @@ public interface IFileContentManager {
/**
* Get the content type for a given file extension.
- * @param filename The extension
+ * @param extension The extension
* @return one of <code>Team.UNKNOWN</code>, <code>Team.TEXT</code> or <code>Team.BINARY</code>.
*
* @since 3.1
@@ -113,7 +113,7 @@ public interface IFileContentManager {
* the preferences. Already existing mappings for these extensions are updated
* with the new ones, other mappings will be preserved.
*
- * @param names The extensions
+ * @param extensions The extensions
* @param types The corresponding types, each one being one of
* <code>Team.UNKNOWN</code>,<code>Team.TEXT</code> or
* <code>Team.BINARY</code>.
@@ -141,7 +141,7 @@ public interface IFileContentManager {
* mapping in the preferences. All existing user-defined mappings for <b>any
* </b> file extensions are deleted and replaced by the new ones.
*
- * @param names The extensions
+ * @param extensions The extensions
* @param types The corresponding types, each one being one of
* <code>Team.UNKNOWN</code>,<code>Team.TEXT</code> or
* <code>Team.BINARY</code>.
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java
index 8b88f20c6..c7f0854d2 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/Team.java
@@ -90,7 +90,7 @@ public final class Team {
* This method answers true if the file matches one of the global ignore
* patterns, or if the file is marked as derived.
*
- * @param file the file
+ * @param resource the file
* @return whether the file should be ignored
*/
public static boolean isIgnoredHint(IResource resource) {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ChangeSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ChangeSet.java
index a5dbb4ebf..7efa5c568 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ChangeSet.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ChangeSet.java
@@ -11,7 +11,6 @@
package org.eclipse.team.core.subscribers;
import org.eclipse.core.resources.IResource;
-import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.SyncInfoTree;
@@ -80,8 +79,7 @@ public abstract class ChangeSet {
/**
* Add the resource to this set if it is modified
* w.r.t. the subscriber.
- * @param resource
- * @throws TeamException
+ * @param info
*/
public void add(SyncInfo info) {
if (isValidChange(info)) {
@@ -103,8 +101,7 @@ public abstract class ChangeSet {
/**
* Add the resources to this set if they are modified
* w.r.t. the subscriber.
- * @param resources the resources to be added.
- * @throws TeamException
+ * @param infos the resources to be added.
*/
public void add(SyncInfo[] infos) {
try {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ISubscriberChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ISubscriberChangeEvent.java
index 1961991c7..6be378957 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ISubscriberChangeEvent.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ISubscriberChangeEvent.java
@@ -26,7 +26,7 @@ public interface ISubscriberChangeEvent {
*====================================================================*/
/**
* Delta kind constant indicating that the resource has not been changed in any way
- * @see IResourceDelta#getKind
+ * @see org.eclipse.core.resources.IResourceDelta#getKind()
*/
public static final int NO_CHANGE = 0;
/**
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java
index ba54254b2..b72f9dcf1 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java
@@ -182,9 +182,6 @@ abstract public class Subscriber {
* <code>DEPTH_ONE</code>, or <code>DEPTH_INFINITE</code>
* @param monitor progress monitor, or <code>null</code> if progress
* reporting and cancellation are not desired
- * @return status with code <code>OK</code> if there were no problems;
- * otherwise a description (possibly a multi-status) consisting of
- * low-severity warnings or informational messages.
* @exception TeamException if this method fails. Reasons include:
* <ul>
* <li>The server could not be contacted.</li>
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeSetCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeSetCollector.java
index 7bac6c1b5..e8f3b0f91 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeSetCollector.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeSetCollector.java
@@ -291,9 +291,8 @@ public class SubscriberChangeSetCollector extends ChangeSetCollector implements
* so no events are fired. The set can be added using the
* <code>add</code> method.
* @param title the title of the commit set
- * @param files the files contained in the set
+ * @param infos the files contained in the set
* @return the created set
- * @throws CVSException
*/
public ActiveChangeSet createSet(String title, SyncInfo[] infos) {
ActiveChangeSet commitSet = new ActiveChangeSet(this, title);
@@ -341,7 +340,7 @@ public class SubscriberChangeSetCollector extends ChangeSetCollector implements
/**
* Retrn the set which is currently the default or
* <code>null</code> if there is no default set.
- * @return
+ * @return the default change set
*/
public ActiveChangeSet getDefaultSet() {
return defaultSet;
@@ -465,9 +464,9 @@ public class SubscriberChangeSetCollector extends ChangeSetCollector implements
}
/**
- * Return the id that will uniquely identify the subscriber accross
+ * Return the id that will uniquely identify the subscriber across
* restarts.
- * @return
+ * @return the id that will uniquely identify the subscriber across
*/
protected String getSubscriberIdentifier() {
return getSubscriber().getName();
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java
index 6658ee042..32d03de9b 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java
@@ -614,7 +614,6 @@ public class SyncInfoSet {
* resource contains all relevent information.
* The error will remain in the set until the set is reset.
* </p>
- * @param resource the resource associated with the error or the workspace root
* @param status the status that describes the error that occurred.
*/
public void addError(ITeamStatus status) {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariant.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariant.java
index d2ac3043c..e10628b8b 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariant.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariant.java
@@ -62,7 +62,6 @@ public interface IResourceVariant {
* or revisions of the same resource.
*
* @return a String that identifies the version of the subscriber resource
- * @throws TeamException
*/
public String getContentIdentifier();
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariantComparator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariantComparator.java
index c39483995..c639d74ca 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariantComparator.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/IResourceVariantComparator.java
@@ -31,7 +31,7 @@ public interface IResourceVariantComparator {
* matches the remote resource based on this criteria and <code>false</code>
* otherwise. Comparing should be fast and based on cached information.
*
- * @param resource the local resource to be compared
+ * @param local the local resource to be compared
* @param remote the remote resources to be compared
* @return <code>true</code> if local and remote are equal based on this criteria and <code>false</code>
* otherwise.
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantByteStore.java
index 82ebe51e5..de501bd99 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantByteStore.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantByteStore.java
@@ -120,9 +120,9 @@ public abstract class ResourceVariantByteStore {
* may override to obtain scheduling rules or batch deltas (if
* the byte store modifies workspace resources).
* @param root the root resource for all modifications
- * @param action the action to perform
+ * @param runnable the action to perform
* @param monitor a progress monitor.
- * @exception CoreException if the operation failed.
+ * @exception TeamException if the operation failed.
* @exception OperationCanceledException if the operation is canceled.
*/
public void run(IResource root, IWorkspaceRunnable runnable, IProgressMonitor monitor) throws TeamException {
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 5da4877a2..e19426af8 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
@@ -92,7 +92,7 @@ public class CVSProjectSetCapability extends ProjectSetCapability {
CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(project);
CVSWorkspaceRoot root = provider.getCVSWorkspaceRoot();
- CVSRepositoryLocation location = CVSRepositoryLocation.fromString(root.getRemoteLocation().getLocation());
+ CVSRepositoryLocation location = CVSRepositoryLocation.fromString(root.getRemoteLocation().getLocation(false));
location.setUserMuteable(true);
String repoLocation = location.getLocation();
buffer.append(repoLocation);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
index 2c2b8f61f..6962c4819 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
@@ -444,7 +444,7 @@ public class CVSTeamProvider extends RepositoryProvider {
public void setRemoteRoot(ICVSRepositoryLocation location, IProgressMonitor monitor) throws TeamException {
// Check if there is a differnece between the new and old roots
- final String root = location.getLocation();
+ final String root = location.getLocation(false);
if (root.equals(workspaceRoot.getRemoteLocation()))
return;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java
index d466553b7..4184c2afa 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java
@@ -56,7 +56,7 @@ public interface ICVSRepositoryLocation extends IAdaptable {
* Returns the string representing the receiver. This string
* should contain enough information to recreate the receiver.
*/
- public String getLocation();
+ public String getLocation(boolean forDisplay);
/**
* Returns the immediate children of this location. If tag is <code>null</code> the
@@ -154,4 +154,5 @@ public interface ICVSRepositoryLocation extends IAdaptable {
* @since 3.0
*/
public void setEncoding(String encoding);
+
}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java
index bbd8a7dfb..e4f14d149 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ResponseHandler.java
@@ -81,7 +81,7 @@ public abstract class ResponseHandler {
if (! folder.isCVSFolder()) {
folder.setFolderSyncInfo(new FolderSyncInfo(
Util.getRelativePath(session.getRepositoryRoot(), repositoryDir),
- session.getCVSRepositoryLocation().getLocation(),
+ session.getCVSRepositoryLocation().getLocation(false),
null, false));
}
return folder;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/Connection.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/Connection.java
index 942e7692e..75f3bd178 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/Connection.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/Connection.java
@@ -126,7 +126,7 @@ public class Connection {
try {
serverConnection.open(monitor);
} catch (IOException e) {
- throw new CVSCommunicationException(Policy.bind("Connection.0", fCVSRoot.getLocation(), CVSCommunicationException.getMessageFor(e)), e); //$NON-NLS-1$
+ throw new CVSCommunicationException(Policy.bind("Connection.0", fCVSRoot.getLocation(true), CVSCommunicationException.getMessageFor(e)), e); //$NON-NLS-1$
}
fIsEstablished= true;
}
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 9c314ade3..bbcf7bdd9 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
@@ -74,7 +74,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
public RemoteFolder(RemoteFolder parent, String name, ICVSRepositoryLocation repository, String repositoryRelativePath, CVSTag tag, boolean isStatic) {
super(parent, name);
if (repository != null) {
- this.folderInfo = new FolderSyncInfo(repositoryRelativePath.toString(), repository.getLocation(), tag, isStatic);
+ this.folderInfo = new FolderSyncInfo(repositoryRelativePath.toString(), repository.getLocation(false), tag, isStatic);
}
this.repository = repository;
}
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 41d1120a8..b90719190 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
@@ -99,7 +99,7 @@ public class RemoteModule extends RemoteFolder {
}
} catch (NoSuchElementException e) {
// There is an invalid entry in the modules file. Log it and continue
- CVSProviderPlugin.log(IStatus.WARNING, Policy.bind("RemoteModule.invalidDefinition", moduleDefinitionStrings[i], repository.getLocation()), null); //$NON-NLS-1$
+ CVSProviderPlugin.log(IStatus.WARNING, Policy.bind("RemoteModule.invalidDefinition", moduleDefinitionStrings[i], repository.getLocation(true)), null); //$NON-NLS-1$
continue;
}
LocalOption[] localOptions = (LocalOption[]) localOptionsList.toArray(new LocalOption[localOptionsList.size()]);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java
index 741a89ed6..1ee6bbb03 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/KnownRepositories.java
@@ -90,7 +90,7 @@ public class KnownRepositories {
*/
public ICVSRepositoryLocation addRepository(final ICVSRepositoryLocation repository, boolean broadcast) {
// Check the cache for an equivalent instance and if there is one, just update the cache
- CVSRepositoryLocation existingLocation = internalGetRepository(repository.getLocation());
+ CVSRepositoryLocation existingLocation = internalGetRepository(repository.getLocation(false));
if (existingLocation == null) {
// Store the location
store((CVSRepositoryLocation)repository);
@@ -115,7 +115,7 @@ public class KnownRepositories {
*/
public void disposeRepository(final ICVSRepositoryLocation repository) {
((CVSRepositoryLocation)repository).dispose();
- if (getRepositoriesMap().remove(repository.getLocation()) != null) {
+ if (getRepositoriesMap().remove(repository.getLocation(false)) != null) {
fireNotification(new Notification() {
public void notify(ICVSListener listener) {
listener.repositoryRemoved(repository);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java
index f1a012da7..318d2e01a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java
@@ -370,8 +370,8 @@ public class CVSCompareEditorInput extends CompareEditorInput {
return NODE_NOT_EQUAL;
}
- String leftLocation = leftEdition.getRepository().getLocation();
- String rightLocation = rightEdition.getRepository().getLocation();
+ String leftLocation = leftEdition.getRepository().getLocation(false);
+ String rightLocation = rightEdition.getRepository().getLocation(false);
if (!leftLocation.equals(rightLocation)) {
return NODE_UNKNOWN;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java
index 58c63e4aa..2ccca52bc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java
@@ -55,9 +55,9 @@ public class CVSProjectSetSerializer implements IProjectSetSerializer {
IProject project = providerProjects[i];
CVSTeamProvider provider = (CVSTeamProvider)RepositoryProvider.getProvider(project);
CVSWorkspaceRoot root = provider.getCVSWorkspaceRoot();
- CVSRepositoryLocation location = CVSRepositoryLocation.fromString(root.getRemoteLocation().getLocation());
+ CVSRepositoryLocation location = CVSRepositoryLocation.fromString(root.getRemoteLocation().getLocation(false));
location.setUserMuteable(true);
- String repoLocation = location.getLocation();
+ String repoLocation = location.getLocation(false);
buffer.append(repoLocation);
buffer.append(","); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
index 1976d54b8..8faeaf5ef 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
@@ -117,7 +117,7 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator {
if(shell == null) {
throw new CVSException(Policy.bind("WorkbenchUserAuthenticator.0")); //$NON-NLS-1$
}
- String domain = location == null ? null : location.getLocation();
+ String domain = location == null ? null : location.getLocation(true);
UserValidationDialog dialog = new UserValidationDialog(shell, domain, (username==null)?"":username, message);//$NON-NLS-1$
dialog.setUsernameMutable(userMutable);
dialog.open();
@@ -168,7 +168,7 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator {
Shell shell = Utils.findShell();
if(shell == null) return new String[0];
- String domain = location == null ? null : location.getLocation();
+ String domain = location == null ? null : location.getLocation(true);
KeyboardInteractiveDialog dialog = new KeyboardInteractiveDialog(shell,
domain,
destination,
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
index b7bc01154..9d2ae6f63 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
@@ -16,9 +16,9 @@ import org.eclipse.compare.CompareUI;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.team.core.TeamException;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource;
+import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.ui.*;
+import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.internal.ccvs.ui.operations.RemoteCompareOperation;
/**
@@ -35,7 +35,7 @@ public class CompareRemoteResourcesAction extends CVSAction {
}
try {
if (isSameFolder(editions)) {
- new RemoteCompareOperation(null, editions[0], RemoteCompareOperation.getTag(editions[1])).run();
+ RemoteCompareOperation.create(null, editions[0], RemoteCompareOperation.getTag(editions[1])).run();
} else {
ResourceEditionNode left = new ResourceEditionNode(editions[0]);
ResourceEditionNode right = new ResourceEditionNode(editions[1]);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
index cd6c7e6a3..1b00dfbef 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
@@ -48,8 +48,12 @@ public class CompareRemoteWithTagAction extends CVSAction {
if (tag[0] == null) return;
// Run the compare operation in the background
- new RemoteCompareOperation(getTargetPart(), resource, tag[0])
- .run();
+ try {
+ RemoteCompareOperation.create(getTargetPart(), resource, tag[0])
+ .run();
+ } catch (CVSException e) {
+ throw new InvocationTargetException(e);
+ }
}
/**
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java
index 6a36ee995..8dd100945 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryRootElement.java
@@ -38,14 +38,14 @@ public class CVSRepositoryRootElement extends CVSModelElement {
ICVSRepositoryLocation root = (ICVSRepositoryLocation)o;
o = CVSUIPlugin.getPlugin().getRepositoryManager().getRepositoryRootFor(root);
if (o == null) {
- return root.getLocation();
+ return root.getLocation(true);
}
}
if (o instanceof RepositoryRoot) {
RepositoryRoot root = (RepositoryRoot)o;
String name = root.getName();
if (name == null)
- return root.getRoot().getLocation();
+ return root.getRoot().getLocation(true);
else
return name;
}
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 6a3433720..95b961aff 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
@@ -370,7 +370,7 @@ public class CheckoutIntoOperation extends CheckoutOperation {
return status;
}
- manageFolders(targetFolders, repository.getLocation());
+ manageFolders(targetFolders, repository.getLocation(false));
return OK;
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 3c5fb84ff..4bb5b9b37 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
@@ -279,6 +279,18 @@ public class RemoteCompareOperation extends RemoteOperation {
return tag;
}
+ public static RemoteCompareOperation create(IWorkbenchPart part, ICVSRemoteResource remoteResource, CVSTag tag) throws CVSException {
+ CVSTag tag0 = getTag(remoteResource);
+ CVSTag tag1 = tag;
+ if (tag0.getType() == CVSTag.DATE && tag1.getType() == CVSTag.DATE) {
+ if (tag0.asDate().after(tag1.asDate())) {
+ tag = tag0;
+ remoteResource = remoteResource.forTag(tag1);
+ }
+ }
+ return new RemoteCompareOperation(part, remoteResource, tag);
+ }
+
/**
* Compare two versions of the given remote resource.
* @param shell
@@ -286,7 +298,7 @@ public class RemoteCompareOperation extends RemoteOperation {
* @param left the earlier tag (not null)
* @param right the later tag (not null)
*/
- public RemoteCompareOperation(IWorkbenchPart part, ICVSRemoteResource remoteResource, CVSTag tag) {
+ protected RemoteCompareOperation(IWorkbenchPart part, ICVSRemoteResource remoteResource, CVSTag tag) {
super(part, new ICVSRemoteResource[] {remoteResource});
Assert.isNotNull(tag);
this.right = tag;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
index b2ad792ce..d079f15a0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
@@ -114,7 +114,7 @@ public class RemoteLogOperation extends RepositoryLocationOperation {
* all log entries for a file can be retrieved.
*/
private String getFullPath(ICVSRemoteResource resource) {
- return Util.appendPath(resource.getRepository().getLocation(), resource.getRepositoryRelativePath());
+ return Util.appendPath(resource.getRepository().getLocation(false), resource.getRepositoryRelativePath());
}
public synchronized void clearEntries() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
index f79f1e72d..d2785d8a1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
@@ -329,7 +329,7 @@ public class CVSRepositoryPropertiesPage extends PropertyPage {
useLocationAsLabel.setSelection(label == null);
useCustomLabel.setSelection(!useLocationAsLabel.getSelection());
if (label == null) {
- label = location.getLocation();
+ label = location.getLocation(true);
}
labelText.setText(label);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java
index 50b1cbb54..1dfbf30ee 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CopyRepositoryNameAction.java
@@ -28,7 +28,7 @@ public class CopyRepositoryNameAction extends CVSAction {
ICVSRepositoryLocation[] locations = getSelectedRepositories();
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < locations.length; i++) {
- buffer.append(locations[i].getLocation());
+ buffer.append(locations[i].getLocation(true));
if (i < locations.length - 1) buffer.append("\n"); //$NON-NLS-1$
}
copyToClipbard(Display.getDefault(), buffer.toString());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java
index d5b72d705..619a6912c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java
@@ -97,7 +97,7 @@ public class RemoveRootAction extends SelectionListenerAction {
// This will notify the RepositoryManager of the removal
if (!shared.isEmpty()) {
- final String location = roots[i].getLocation();
+ final String location = roots[i].getLocation(true);
shell.getDisplay().syncExec(new Runnable() {
public void run() {
DetailsDialogWithProjects dialog = new DetailsDialogWithProjects(
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java
index 8735040af..d53918971 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java
@@ -285,7 +285,7 @@ public class RepositoriesView extends RemoteViewPart {
name = res.getRepositoryRelativePath();
}
}
- return Policy.bind("RepositoriesView.ResourceInRepository", name, res.getRepository().getLocation()); //$NON-NLS-1$
+ return Policy.bind("RepositoriesView.ResourceInRepository", name, res.getRepository().getLocation(true)); //$NON-NLS-1$
}
return Policy.bind("RepositoriesView.OneItemSelected"); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java
index cc893bb7f..4642a275a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java
@@ -381,9 +381,9 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
* @see org.eclipse.jface.preference.IPreferencePage#performOk()
*/
public boolean performOk() {
- if (!KnownRepositories.getInstance().isKnownRepository(location.getLocation())) {
+ if (!KnownRepositories.getInstance().isKnownRepository(location.getLocation(false))) {
// The location may have been replaced by the main properties page
- MessageDialog.openInformation(getShell(), Policy.bind("RepositoryEncodingPropertyPage.0"), Policy.bind("RepositoryEncodingPropertyPage.1", location.getLocation())); //$NON-NLS-1$ //$NON-NLS-2$
+ MessageDialog.openInformation(getShell(), Policy.bind("RepositoryEncodingPropertyPage.0"), Policy.bind("RepositoryEncodingPropertyPage.1", location.getLocation(true))); //$NON-NLS-1$ //$NON-NLS-2$
return true;
}
encoding.store();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java
index 1e863e649..0ba2c7b89 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryManager.java
@@ -116,7 +116,7 @@ public class RepositoryManager {
*/
public CVSTag[] getKnownTags(ICVSRepositoryLocation location, int tagType) {
Set result = new HashSet();
- RepositoryRoot root = (RepositoryRoot)repositoryRoots.get(location.getLocation());
+ RepositoryRoot root = (RepositoryRoot)repositoryRoots.get(location.getLocation(false));
if (root != null) {
String[] paths = root.getKnownRemotePaths();
for (int i = 0; i < paths.length; i++) {
@@ -244,7 +244,7 @@ public class RepositoryManager {
* Remove the tags defined for this root and notify any listeners
*/
public void rootRemoved(ICVSRepositoryLocation root) {
- RepositoryRoot repoRoot = (RepositoryRoot)repositoryRoots.remove(root.getLocation());
+ RepositoryRoot repoRoot = (RepositoryRoot)repositoryRoots.remove(root.getLocation(false));
if (repoRoot != null)
broadcastRepositoryChange(repoRoot);
}
@@ -611,7 +611,7 @@ public class RepositoryManager {
}
public RepositoryRoot getRepositoryRootFor(ICVSRepositoryLocation location) {
- RepositoryRoot root = (RepositoryRoot)repositoryRoots.get(location.getLocation());
+ RepositoryRoot root = (RepositoryRoot)repositoryRoots.get(location.getLocation(false));
if (root == null) {
root = new RepositoryRoot(location);
add(root);
@@ -626,7 +626,7 @@ public class RepositoryManager {
* @param currentRepositoryRoot
*/
public void add(RepositoryRoot root) {
- repositoryRoots.put(root.getRoot().getLocation(), root);
+ repositoryRoots.put(root.getRoot().getLocation(false), root);
broadcastRepositoryChange(root);
}
@@ -634,7 +634,7 @@ public class RepositoryManager {
if (notificationLevel == 0) {
broadcastRepositoriesChanged(new ICVSRepositoryLocation[] {root.getRoot()});
} else {
- changedRepositories.put(root.getRoot().getLocation(), root.getRoot());
+ changedRepositories.put(root.getRoot().getLocation(false), root.getRoot());
}
}
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 01590969b..7dbf6a461 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
@@ -463,7 +463,7 @@ public class RepositoryRoot extends PlatformObject {
HashMap attributes = new HashMap();
attributes.clear();
- attributes.put(RepositoriesViewContentHandler.ID_ATTRIBUTE, root.getLocation());
+ attributes.put(RepositoriesViewContentHandler.ID_ATTRIBUTE, root.getLocation(false));
if (name != null) {
attributes.put(RepositoriesViewContentHandler.NAME_ATTRIBUTE, name);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java
index b5eb52453..0290eabb3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositorySorter.java
@@ -96,7 +96,7 @@ public class RepositorySorter extends ViewerSorter {
}
if (o1 instanceof ICVSRepositoryLocation && o2 instanceof ICVSRepositoryLocation) {
- return ((ICVSRepositoryLocation)o1).getLocation().compareTo(((ICVSRepositoryLocation)o2).getLocation());
+ return ((ICVSRepositoryLocation)o1).getLocation(false).compareTo(((ICVSRepositoryLocation)o2).getLocation(false));
}
return super.compare(viewer, o1, o2);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
index e34935a00..0ca594523 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
@@ -54,7 +54,9 @@ public class WorkspaceCommitAction extends CVSParticipantAction {
final SyncInfoSet set = getSyncInfoSet();
final Shell shell= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
try {
- CommitWizard.run(shell, set);
+ // Include the subscriber operation as a job listener so that the busy feedback for the
+ // commit will appear in the synchronize view
+ CommitWizard.run(shell, set, getSubscriberOperation(getConfiguration(), getFilteredDiffElements()));
} catch (CVSException e) {
CVSUIPlugin.log(e);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java
index 64d9d32d0..d034511fb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java
@@ -283,7 +283,7 @@ public class TagSelectionArea extends DialogArea {
* Select the top element in the tag table
*/
private void selectTopElement() {
- if (tagTable.getTable().getItemCount() > 1) {
+ if (tagTable.getTable().getItemCount() > 0) {
TableItem item = tagTable.getTable().getItem(0);
tagTable.getTable().setSelection(new TableItem[] { item });
tagTable.setSelection(tagTable.getSelection());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
index 04bfdefe3..3f8c1710d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
@@ -191,6 +191,7 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
// Only allow configuration if one module is selected
hasMetafile = hasProjectMetafile(selectedModules[0]);
}
+ resetSubwizard();
wizard = new CheckoutAsWizard(getPart(), selectedModules, ! hasMetafile /* allow configuration */);
wizard.addPages();
return wizard.getStartingPage();
@@ -270,7 +271,7 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
KnownRepositories.getInstance().disposeRepository(location);
}
location = newLocation;
- isNewLocation = !KnownRepositories.getInstance().isKnownRepository(newLocation.getLocation());
+ isNewLocation = !KnownRepositories.getInstance().isKnownRepository(newLocation.getLocation(false));
if (isNewLocation) {
// Add the location silently so we can work with it
location = KnownRepositories.getInstance().addRepository(location, false /* silently */);
@@ -284,4 +285,14 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
*/
public void init(IWorkbench workbench, IStructuredSelection selection) {
}
+
+ /*
+ * Reset the sub-wizard
+ */
+ /* package */ void resetSubwizard() {
+ if (wizard != null) {
+ wizard.dispose();
+ wizard = null;
+ }
+ }
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
index 02242215f..c981c2c3c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
@@ -13,9 +13,12 @@ package org.eclipse.team.internal.ccvs.ui.wizards;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
+
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.IWizardPage;
@@ -53,6 +56,7 @@ public class CommitWizard extends ResizableWizard {
private Map fModesForNamesForOneTime;
private IResource[] fNewResources;
+ private IJobChangeListener jobListener;
private AddAndCommitOperation(IWorkbenchPart part, IResource[] allResources, String comment) {
super(part);
@@ -94,6 +98,34 @@ public class CommitWizard extends ResizableWizard {
protected String getTaskName() {
return Policy.bind("CommitWizard.1"); //$NON-NLS-1$
}
+
+ /*
+ * Set the job listener. It will only recieve scheduled and done
+ * events as these are what are used by a sync model operation
+ * to show busy state in the sync view.
+ */
+ protected void setJobChangeListener(IJobChangeListener jobListener) {
+ this.jobListener = jobListener;
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.jobs.IJobChangeListener#done(org.eclipse.core.runtime.jobs.IJobChangeEvent)
+ */
+ public void done(IJobChangeEvent event) {
+ super.done(event);
+ if (jobListener != null)
+ jobListener.done(event);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.jobs.IJobChangeListener#scheduled(org.eclipse.core.runtime.jobs.IJobChangeEvent)
+ */
+ public void scheduled(IJobChangeEvent event) {
+ super.scheduled(event);
+ if (jobListener != null)
+ jobListener.scheduled(event);
+ }
}
private final IResource[] fResources;
@@ -103,6 +135,7 @@ public class CommitWizard extends ResizableWizard {
private CommitWizardFileTypePage fFileTypePage;
private CommitWizardCommitPage fCommitPage;
+ private IJobChangeListener jobListener;
public CommitWizard(SyncInfoSet infos) throws CVSException {
this(infos.getResources());
@@ -123,6 +156,11 @@ public class CommitWizard extends ResizableWizard {
fUnaddedInfos= getUnaddedInfos(fOutOfSyncInfos);
}
+ public CommitWizard(SyncInfoSet infos, IJobChangeListener jobListener) throws CVSException {
+ this(infos);
+ this.jobListener = jobListener;
+ }
+
private SyncInfoSet getAllOutOfSync() throws CVSException {
final SubscriberSyncInfoCollector syncInfoCollector = fParticipant.getSubscriberSyncInfoCollector();
try {
@@ -182,6 +220,8 @@ public class CommitWizard extends ResizableWizard {
}
final AddAndCommitOperation operation= new AddAndCommitOperation(getPart(), infos.getResources(), comment);
+ if (jobListener != null)
+ operation.setJobChangeListener(jobListener);
if (fFileTypePage != null) {
final Map extensionsToSave= new HashMap();
@@ -216,8 +256,8 @@ public class CommitWizard extends ResizableWizard {
public void addPages() {
- final Collection names= new ArrayList();
- final Collection extensions= new ArrayList();
+ final Collection names= new HashSet();
+ final Collection extensions= new HashSet();
getUnknownNamesAndExtension(fUnaddedInfos, names, extensions);
if (names.size() + extensions.size() > 0) {
@@ -244,9 +284,9 @@ public class CommitWizard extends ResizableWizard {
}
}
- public static void run(Shell shell, SyncInfoSet infos) throws CVSException {
+ public static void run(Shell shell, SyncInfoSet infos, IJobChangeListener jobListener) throws CVSException {
try {
- run(shell, new CommitWizard(infos));
+ run(shell, new CommitWizard(infos, jobListener));
} catch (OperationCanceledException e) {
// Ignore
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
index 7df778ff7..d98791efa 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.wizard.IWizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
@@ -104,6 +105,10 @@ public class ModuleSelectionPage extends CVSWizardPage {
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
+ IWizard w = getWizard();
+ if (w instanceof CheckoutWizard) {
+ ((CheckoutWizard)w).resetSubwizard();
+ }
if (useProjectNameButton != null && useProjectNameButton.getSelection()) {
useProjectNameButton.setFocus();
} else if (useSpecifiedNameButton.getSelection()) {
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 35c570125..7e7456469 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
@@ -378,7 +378,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW
KnownRepositories.getInstance().disposeRepository(location);
}
location = newLocation;
- isNewLocation = !KnownRepositories.getInstance().isKnownRepository(newLocation.getLocation());
+ isNewLocation = !KnownRepositories.getInstance().isKnownRepository(newLocation.getLocation(false));
if (isNewLocation) {
// Add the location silently so we can work with it
location = KnownRepositories.getInstance().addRepository(location, false /* silently */);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java
index d3aacd1ff..956d1f4d0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java
@@ -11,33 +11,17 @@
package org.eclipse.team.internal.ui.preferences;
-import java.text.Collator;
import java.util.Collection;
import java.util.List;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.*;
import org.eclipse.team.core.Team;
-import org.eclipse.team.internal.ui.PixelConverter;
-import org.eclipse.team.internal.ui.Policy;
-import org.eclipse.team.internal.ui.SWTUtils;
+import org.eclipse.team.internal.ui.*;
public class FileTypeTable implements ICellModifier, IStructuredContentProvider, ITableLabelProvider, IColorProvider {
@@ -51,10 +35,8 @@ public class FileTypeTable implements ICellModifier, IStructuredContentProvider,
private static final String [] SAVE_TEXT= { Policy.bind("FileTypeTable.2"), Policy.bind("FileTypeTable.3") }; //$NON-NLS-1$ //$NON-NLS-2$
private static final class FileTypeSorter extends ViewerSorter {
- private final Collator fCollator;
public FileTypeSorter() {
- fCollator= Collator.getInstance();
}
private int getCategory(Object element) {
@@ -70,7 +52,7 @@ public class FileTypeTable implements ICellModifier, IStructuredContentProvider,
final int compare= getCategory(e1) - getCategory(e2);
if (compare != 0)
return compare;
- return fCollator.compare(((Item)e1).name, ((Item)e2).name);
+ return super.compare(viewer, ((Item)e1).name, ((Item)e2).name);
}
}
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 3cfb5d91c..d163c37b2 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
@@ -834,7 +834,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
}
}
// Notify the update handler that the node has been cleared
- updateHandler.modelObjectCleared(node);
+ if (node != getModelRoot())
+ updateHandler.modelObjectCleared(node);
}
/*
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java
index e951c85cc..fabc34a9d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java
@@ -394,6 +394,7 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
private ISynchronizeModelProvider createProvider(ChangeSet set, SyncInfoTree tree) {
ChangeSetDiffNode node = new ChangeSetDiffNode(getModelRoot(), set);
+ addToViewer(node);
return createProviderRootedAt(node, tree);
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch
index 23bf3101d..ba4467505 100644
--- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch
+++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch
@@ -1,25 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<stringAttribute key="product" value="Random_Name.product"/>
+<stringAttribute key="bootstrap" value=""/>
+<booleanAttribute key="useProduct" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<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.AllCoreTests"/>
-<booleanAttribute key="tracing" value="false"/>
<stringAttribute key="location1" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
<booleanAttribute key="default" value="true"/>
<stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<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"/>
<stringAttribute key="location0" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.debug.ui.javaSourceLocator"/>
</launchConfiguration>
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java
index ec6ff38d3..d4c2137b1 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/CommandLineCVSClient.java
@@ -27,7 +27,7 @@ public class CommandLineCVSClient implements ICVSClient {
public void executeCommand(ICVSRepositoryLocation repositoryLocation,
IContainer localRoot, String command, String[] globalOptions,
String[] localOptions, String[] arguments) throws CVSException {
- execute(repositoryLocation.getLocation(), localRoot.getLocation().toFile(), command,
+ execute(repositoryLocation.getLocation(false), localRoot.getLocation().toFile(), command,
globalOptions, localOptions, arguments);
try {
localRoot.refreshLocal(IResource.DEPTH_INFINITE, null);

Back to the top