Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-06-10 16:28:41 -0400
committerMichael Valenta2005-06-10 16:28:41 -0400
commit615eed9beae8060820309ef039197602a54cc4ef (patch)
treed63c5263adf850d011eb63a346161681d345d1c1
parenta109ac91c6111936b30b282b0563df55039629be (diff)
downloadeclipse.platform.team-615eed9beae8060820309ef039197602a54cc4ef.tar.gz
eclipse.platform.team-615eed9beae8060820309ef039197602a54cc4ef.tar.xz
eclipse.platform.team-615eed9beae8060820309ef039197602a54cc4ef.zip
Spellchecked Javadoc
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/IFileContentManager.java3
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/IProjectSetSerializer.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/IStringMapping.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/ITeamStatus.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetSerializationContext.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java36
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java8
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamException.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamStatus.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/ISubscriberChangeEvent.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/Subscriber.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeEvent.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeEvent.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeListener.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoTreeChangeEvent.java8
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfo.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoFilter.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoSet.java20
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoTree.java6
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java12
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java2
-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/PersistantResourceVariantByteStore.java6
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantByteStore.java6
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTree.java4
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWayResourceComparator.java2
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java8
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java8
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java1
32 files changed, 85 insertions, 85 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 caa7f9a04..4ab3252fc 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
@@ -36,7 +36,7 @@ import org.eclipse.core.resources.IStorage;
* If a mapping is added for a name or an extension that already has a mapping
* which has been contributed by a plugin, it overrides the one contributed by the plugin.
* If the user-defined mapping is deleted, the plugin-contributed mapping is valid again.
- * This interface is not intented to be implemented by clients.
+ * This interface is not intended to be implemented by clients.
*
* <p>
* This interface is not intended to be implemented by clients.
@@ -173,7 +173,6 @@ public interface IFileContentManager {
/**
* Get all the plugin-contributed mappings from file names to content types.
- * TODO: the extension point for names is still missing.
*
* @return the mappings
*
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IProjectSetSerializer.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IProjectSetSerializer.java
index b580202a4..b0c365799 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IProjectSetSerializer.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IProjectSetSerializer.java
@@ -56,7 +56,7 @@ public interface IProjectSetSerializer {
* produced by IProjectSetSerializer.asReference().
* @see IProjectSetSerializer#asReference(IProject[] providerProjects, Object context, IProgressMonitor monitor)
*
- * @param referenceStrings an array of referene strings uniquely identifying the projects
+ * @param referenceStrings an array of reference strings uniquely identifying the projects
* @param filename the name of the file that the references were read from. This is included
* in case the provider needs to deduce relative paths
* @param context a UI context object. This object will either be a
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IStringMapping.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IStringMapping.java
index fedde479f..544f794c6 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IStringMapping.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/IStringMapping.java
@@ -17,7 +17,7 @@ package org.eclipse.team.core;
* and a content type (typically <code>Team.TEXT</code>, <code>Team.BINARY</code> or
* <code>Team.UNKNOWN</code>.
* <p>
- * This interface is not intented to be implemented by clients.
+ * This interface is not intended to be implemented by clients.
*
* @since 3.1
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ITeamStatus.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ITeamStatus.java
index a6a40f55c..1fa526dff 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ITeamStatus.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ITeamStatus.java
@@ -34,8 +34,8 @@ public interface ITeamStatus extends IStatus {
public static final int SYNC_INFO_SET_ERROR = 2;
/**
- * The collection of sync info for a sync info set has been cancelled so the
- * contents fdo not reflect the state of the system.
+ * The collection of sync info for a sync info set has been canceled so the
+ * contents do not reflect the state of the system.
* The error will be cleared when the set is reset.
*/
public static final int SYNC_INFO_SET_CANCELLATION = 3;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java
index e790e5d51..d1d0d6900 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetCapability.java
@@ -166,7 +166,7 @@ public abstract class ProjectSetCapability {
* @since 3.0
*
* @param referenceStrings
- * an array of referene strings uniquely identifying the projects
+ * an array of reference strings uniquely identifying the projects
* (not <code>null</code> and contains no <code>null</code>s)
* @param context
* the context in which the projects are loaded
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetSerializationContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetSerializationContext.java
index 5d6d31eae..91617825f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetSerializationContext.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/ProjectSetSerializationContext.java
@@ -71,7 +71,7 @@ public class ProjectSetSerializationContext {
}
/**
- * Return the name of the file to or from which teh project set is being loaded or saved.
+ * Return the name of the file to or from which the project set is being loaded or saved.
* This may be <code>null</code>.
* @return the filename or <code>null</code>
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java
index 5daf35a88..ee4196254 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProvider.java
@@ -60,7 +60,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
// lock to ensure that map/unmap and getProvider support concurrency
private static final ILock mappingLock = Platform.getJobManager().newLock();
- // Session property used to indentify projects that are not mapped
+ // Session property used to identify projects that are not mapped
private static final Object NOT_MAPPED = new Object();
/**
@@ -103,7 +103,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
unmap(project);
}
- // Create the provider as a session property before adding the persistant
+ // Create the provider as a session property before adding the persistent
// property to ensure that the provider can be instantiated
RepositoryProvider provider = mapNewProvider(project, id);
@@ -111,7 +111,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
try {
project.setPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY, id);
} catch (CoreException outer) {
- // couldn't set the persistant property so clear the session property
+ // couldn't set the persistent property so clear the session property
try {
project.setSessionProperty(TeamPlugin.PROVIDER_PROP_KEY, null);
} catch (CoreException inner) {
@@ -121,13 +121,13 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
throw outer;
}
- provider.configure(); //xxx not sure if needed since they control with wiz page and can configure all they want
+ provider.configure();
//adding the nature would've caused project description delta, so trigger one
project.touch(null);
// Set the rule factory for the provider after the touch
- // so the touch does not fail due to incomptible modify rules
+ // so the touch does not fail due to incompatible modify rules
TeamHookDispatcher.setProviderRuleFactory(project, provider.getRuleFactory());
} finally {
mappingLock.release();
@@ -187,7 +187,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
// that a disconnect is not happening at the same time
mappingLock.acquire();
try {
- // Ensure that the persistant property is still set
+ // Ensure that the persistent property is still set
// (i.e. an unmap may have come in since we checked it last
String currentId = project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY);
if (currentId == null) {
@@ -209,7 +209,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
}
}
/**
- * Disassoociates project with the repository provider its currently mapped to.
+ * Disassociates project with the repository provider its currently mapped to.
* @param project
* @throws TeamException The project isn't associated with any repository provider.
*/
@@ -231,7 +231,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
//which is ok since we need to call deconfigure() on it for proper lifecycle
RepositoryProvider provider = getProvider(project);
if (provider == null) {
- // There is a persistant property but the provider cannot be obtained.
+ // There is a persistent property but the provider cannot be obtained.
// The reason could be that the provider's plugin is no longer available.
// Better log it just in case this is unexpected.
TeamPlugin.log(IStatus.ERROR, NLS.bind(Messages.RepositoryProvider_couldNotInstantiateProvider, new String[] { project.getName(), id }), null); //$NON-NLS-1$
@@ -341,7 +341,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
/**
* Returns an <code>IMoveDeleteHook</code> for handling moves and deletes
- * that occur withing projects managed by the provider. This allows providers
+ * that occur within projects managed by the provider. This allows providers
* to control how moves and deletes occur and includes the ability to prevent them.
* <p>
* Returning <code>null</code> signals that the default move and delete behavior is desired.
@@ -406,8 +406,8 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
RepositoryProvider provider = lookupProviderProp(project);
if(provider != null)
return provider;
- // Do a quick check to see it the poroject is known to be unshared.
- // This is done to avoid accessing the persistant property store
+ // Do a quick check to see it the project is known to be unshared.
+ // This is done to avoid accessing the persistent property store
if (isMarkedAsUnshared(project))
return null;
@@ -467,7 +467,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
final public static RepositoryProvider getProvider(IProject project, String id) {
try {
if(project.isAccessible()) {
- // Look for an existing provider first to avoid accessing persistant properties
+ // Look for an existing provider first to avoid accessing persistent properties
RepositoryProvider provider = lookupProviderProp(project); //throws core, we will reuse the catching already here
if(provider != null) {
if (provider.getID().equals(id)) {
@@ -476,12 +476,12 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
return null;
}
}
- // Do a quick check to see it the poroject is known to be unshared.
- // This is done to avoid accessing the persistant property store
+ // Do a quick check to see it the project is known to be unshared.
+ // This is done to avoid accessing the persistent property store
if (isMarkedAsUnshared(project))
return null;
- // There isn't one so check the persistant property
+ // There isn't one so check the persistent property
String existingID = project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY);
if(id.equals(existingID)) {
// The ids are equal so instantiate and return
@@ -500,7 +500,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
// if the nature id given is not in the team set then return
// null.
IProjectNatureDescriptor desc = ResourcesPlugin.getWorkspace().getNatureDescriptor(id);
- if(desc == null) //for backwards compat., may not have any nature by that ID
+ if(desc == null) //for backwards compatibility, may not have any nature by that ID
return null;
String[] setIds = desc.getNatureSetIds();
@@ -539,7 +539,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
try {
if (lookupProviderProp(project) != null) return true;
// Do a quick check to see it the poroject is known to be unshared.
- // This is done to avoid accessing the persistant property store
+ // This is done to avoid accessing the persistent property store
if (isMarkedAsUnshared(project))
return false;
boolean shared = project.getPersistentProperty(TeamPlugin.PROVIDER_PROP_KEY) != null;
@@ -635,7 +635,7 @@ public abstract class RepositoryProvider implements IProjectNature, IAdaptable {
* linked resource is about to be added to the provider's project. It should
* not be called by other clients and it should not need to be overridden by
* subclasses (although it is possible to do so in special cases).
- * Subclasses can indicate that they support linked resources by overridding
+ * Subclasses can indicate that they support linked resources by overriding
* the <code>canHandleLinkedResources()</code> method.
*
* @param resource see <code>org.eclipse.core.resources.team.TeamHook</code>
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java
index 5d9d9de6f..e7ede05e5 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/RepositoryProviderType.java
@@ -28,7 +28,7 @@ import org.eclipse.team.internal.core.TeamPlugin;
* is in the absence of a project, as opposed to RepositoryProvider which
* requires a concrete project in order to be instantiated.
* <p>
- * A repository provider type class is asscoaited with it's provider ID along with it's
+ * A repository provider type class is associated with it's provider ID along with it's
* corresponding repository provider class. To add a
* repository provider type and have it registered with the platform, a client
* must minimally:
@@ -170,12 +170,12 @@ public abstract class RepositoryProviderType {
/**
* Callback from team when the meta-files for a repository type are detected in an
- * unshared project. The meta-file paths ae provided as part of the <code>repository</code>
- * entry in the plugin manifets file.
+ * unshared project. The meta-file paths are provided as part of the <code>repository</code>
+ * entry in the plugin manifest file.
* <p>
* By default, nothing is done (except that the repository type's
* plugin will have been loaded. Subclass may wish to mark the met-data as team-private.
- * This method is called from a resource delta so sublcasses may not obtain scheduling rules
+ * This method is called from a resource delta so subclasses may not obtain scheduling rules
* or in any way modify workspace resources (including auto-sharing the project). However,
* auto-sharing (or other modification) could be performed by a background job scheduled from
* this callback.
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamException.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamException.java
index a26e42a77..20cb070c4 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamException.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamException.java
@@ -20,7 +20,7 @@ import org.eclipse.team.internal.core.TeamPlugin;
/**
* This exception is thrown by the team provider API. It represents a failure in an API call.
* Since some API calls take multiple arguments, the exception is capable of returning multiple
- * statuses. The API definition determinies if the exception represents a single or multiple status
+ * statuses. The API definition determines if the exception represents a single or multiple status
* response; this can also be tested on the exception instance itself.
* <p>
* To determine the exact cause of the failure the caller should look at each status in detail.
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamStatus.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamStatus.java
index b104cf7d4..3557dc3cc 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamStatus.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/TeamStatus.java
@@ -34,7 +34,7 @@ public class TeamStatus extends Status implements ITeamStatus {
* current locale
* @param exception a low-level exception, or <code>null</code> if not
* applicable
- * @param resource the resource asociated with the exception
+ * @param resource the resource associated with the exception
*/
public TeamStatus(int severity, String pluginId, int code, String message, Throwable exception, IResource resource) {
super(severity, pluginId, code, message, exception);
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 30a6890d2..95d88d795 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
@@ -15,7 +15,7 @@ import org.eclipse.core.resources.IResource;
* A change event that describes a change in a resource
* that is or was supervised by a subscriber.
* <p>
- * Clients are not intented to implement. Instead subclass {@link SubscriberChangeEvent}.
+ * Clients are not intended to implement. Instead subclass {@link SubscriberChangeEvent}.
* </p>
* @see ISubscriberChangeListener
* @since 3.0
@@ -49,7 +49,7 @@ public interface ISubscriberChangeEvent {
* Return the flags that describe the type of change.
* The returned value should be ANDed with the change type
* flags to determine whether the change event is of
- * a particular type. For exampe,
+ * a particular type. For example,
* <pre>
* if (event.getFlags() & ISubscriberChangeEvent.SYNC_CHANGED) {
* // the sync info for the resource has changed
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 800e55f4d..aae7bd7a1 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
@@ -57,7 +57,7 @@ import org.eclipse.team.internal.core.TeamPlugin;
* or removed. For example, a subscriber for a repository provider would fire a root added event when a project
* was shared
* with a repository. No event is required when a root is deleted as this is available through the
- * <code>IResource</code> delta mechanism. It is up to clients to requery the subscriber
+ * <code>IResource</code> delta mechanism. It is up to clients to re-query the subscriber
* when the state of a resource changes locally by listening to IResource deltas.
* </p><p>
* The remote and base states can also include the state for resources that do not exist locally (i.e outgoing deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeEvent.java
index 2053d06d9..23980997b 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeEvent.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberChangeEvent.java
@@ -28,7 +28,7 @@ public class SubscriberChangeEvent implements ISubscriberChangeEvent {
private IResource resource;
/**
- * Create a cahnge event with the given flags for the given subscriber and resource.
+ * Create a change event with the given flags for the given subscriber and resource.
* @param subscriber the subscriber to which the state change applies
* @param flags the flags that describe the change
* @param resource the resource whose state has change
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java
index 3c0511efb..4f543c64c 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/FastSyncInfoFilter.java
@@ -45,11 +45,11 @@ public class FastSyncInfoFilter extends SyncInfoFilter {
*/
public static abstract class CompoundSyncInfoFilter extends FastSyncInfoFilter {
/**
- * Instance variable which contains all the child filters for ths compound filter.
+ * Instance variable which contains all the child filters for this compound filter.
*/
protected FastSyncInfoFilter[] filters;
/**
- * Create a compund filter that contains the provided filters.
+ * Create a compound filter that contains the provided filters.
* @param filters the child filters
*/
protected CompoundSyncInfoFilter(FastSyncInfoFilter[] filters) {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeEvent.java
index f9a3ee8a8..57444998f 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeEvent.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeEvent.java
@@ -17,7 +17,7 @@ import org.eclipse.core.resources.IResource;
* a description of the changes which include added, changed and removed resources.
* In some cases, (e.g. when the change is too complicated to be efficiently described
* using the mechanisms provided by this interface) the event will be a reset. In these
- * cases, the client should ignore any other contents of the event and reclaculate
+ * cases, the client should ignore any other contents of the event and recalculate
* from scratch any state that is derived from the <code>SyncInfoSet</code> from
* which the event originated.
* <p>
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeListener.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeListener.java
index c970050d3..79c0f7143 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeListener.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoSetChangeListener.java
@@ -25,7 +25,7 @@ import org.eclipse.team.core.ITeamStatus;
* The originating sync set holds modification locks on the sync info set to ensure
* that no more changes occur until after the current change event is processed.
* The implementors of this interface must not modify the set within the scope of
- * the listener's methods. If modiciations are attempted a runtime exception will occur.
+ * the listener's methods. If modifications are attempted a runtime exception will occur.
* </p>
* @see ISyncInfoSetChangeEvent
* @since 3.0
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoTreeChangeEvent.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoTreeChangeEvent.java
index 905b08c29..1932fe27c 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoTreeChangeEvent.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/ISyncInfoTreeChangeEvent.java
@@ -25,10 +25,10 @@ public interface ISyncInfoTreeChangeEvent extends ISyncInfoSetChangeEvent {
* Returns the highest parent resources of all newly added elements available in this event
* by calling <code>getAddedResources()</code>. In other words, it returns the set of all
* parent containers that did not previously have descendants in the sync set but are direct
- * children of containers that did previously have descescendants in the set.
+ * children of containers that did previously have descendants in the set.
* <p>
* These roots are provided in order
- * to allow listeners to optimize the reconciliation of hierachical views of
+ * to allow listeners to optimize the reconciliation of hierarchical views of
* the <code>SyncInfoSet</code> contents.
*
* @return parents of all newly added elements or an empty list if this event
@@ -40,10 +40,10 @@ public interface ISyncInfoTreeChangeEvent extends ISyncInfoSetChangeEvent {
* Returns the highest parent resources of all newly removed elements available in this event
* by calling <code>getRemovedResources()</code>. In other words, it returns the set of all
* parent containers that previously had descendants in the sync set but are direct
- * children of containers that still have descescendants in the set.
+ * children of containers that still have descendants in the set.
* <p>
* These roots are provided in order
- * to allow listeners to optimize the reconciliation of hierachical views of
+ * to allow listeners to optimize the reconciliation of hierarchical views of
* the <code>SyncInfoSet</code> contents.
*
* @return parents of all newly removed elements. or an empty list if this event
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfo.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfo.java
index bf3bcfb0a..e7d8b1cfb 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfo.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfo.java
@@ -348,7 +348,7 @@ public class SyncInfo implements IAdaptable {
* string describing the provided sync kind.
*
* @param kind the sync kind obtained from a <code>SyncInfo</code>
- * @return a displayable string that descibes the kind
+ * @return a displayable string that describes the kind
*/
public static String kindToString(int kind) {
String label = ""; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoFilter.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoFilter.java
index 5f06b1310..5eb2f6d0a 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoFilter.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/synchronize/SyncInfoFilter.java
@@ -47,7 +47,7 @@ public abstract class SyncInfoFilter {
this(false);
}
/**
- * Create a filter and configure how whitspace is handled.
+ * Create a filter and configure how whitespace is handled.
* @param ignoreWhitespace whether whitespace should be ignored
*/
public ContentComparisonSyncInfoFilter(boolean ignoreWhitespace) {
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 c44eda18a..fb37f07cb 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
@@ -198,10 +198,10 @@ public class SyncInfoSet {
}
/**
- * Deregisters the given listener for participant notifications. Has
+ * Removes the given listener from participant notifications. Has
* no effect if listener is not already registered.
*
- * @param listener listener to deregister
+ * @param listener listener to remove
*/
public void removeSyncSetChangedListener(ISyncInfoSetChangeListener listener) {
synchronized(listeners) {
@@ -232,7 +232,7 @@ public class SyncInfoSet {
* <p>
* The given runnable may be run in the same thread as the caller or
* more be run asynchronously in another thread at the discretion of the
- * subclass implementation. However, it is gaurenteed that two invocations
+ * subclass implementation. However, it is guaranteed that two invocations
* of <code>run</code> performed in the same thread will be executed in the
* same order even if run in different threads.
* </p>
@@ -320,7 +320,7 @@ public class SyncInfoSet {
}
/**
- * Add all the syncinfo from the given set to this set.
+ * Add all the sync info from the given set to this set.
*
* @param set the set whose sync info should be added to this set
*/
@@ -508,8 +508,8 @@ public class SyncInfoSet {
}
/**
- * This method is used to release the lock on this set. The prgress monitor is needed to allow
- * listeners to perform long-running operations is reponse to the set change. The lock is held
+ * This method is used to release the lock on this set. The progress monitor is needed to allow
+ * listeners to perform long-running operations is response to the set change. The lock is held
* while the listeners are notified so listeners must be cautious in order to avoid deadlock.
*/
public void endInput(IProgressMonitor monitor) {
@@ -595,7 +595,7 @@ public class SyncInfoSet {
/**
* Return the change event that is accumulating the changes to the set.
- * This can be called by sublasses to access the event.
+ * This can be called by subclasses to access the event.
* @return Returns the changes.
*/
protected SyncSetChangedEvent getChangeEvent() {
@@ -611,7 +611,7 @@ public class SyncInfoSet {
* Only one error can be associated with a resource (which is obtained from
* the <code>ITeamStatus</code>). It is up to the
* client populating the set to ensure that the error associated with a
- * resource contains all relevent information.
+ * resource contains all relevant information.
* The error will remain in the set until the set is reset.
* </p>
* @param status the status that describes the error that occurred.
@@ -637,9 +637,9 @@ public class SyncInfoSet {
}
/**
- * Return an interator over all <code>SyncInfo</code>
+ * Return an iterator over all <code>SyncInfo</code>
* contained in this set.
- * @return an interator over all <code>SyncInfo</code>
+ * @return an iterator over all <code>SyncInfo</code>
* contained in this set.
* @since 3.1
*/
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 2f945a913..c657231be 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
@@ -49,7 +49,7 @@ public class SyncInfoTree extends SyncInfoSet {
}
/**
- * Return wether the given resource has any children in the sync set. The children
+ * Return whether the given resource has any children in the sync set. The children
* could be either out-of-sync resources that are contained by the set or containers
* that are ancestors of out-of-sync resources contained by the set.
*
@@ -195,7 +195,7 @@ public class SyncInfoTree extends SyncInfoSet {
if (parent.getType() == IResource.ROOT) {
return false;
}
- // this flag is used to indicate if the parent was previosuly in the set
+ // this flag is used to indicate if the parent was previously in the set
boolean addedParent = false;
if (parent.getType() == IResource.FILE) {
// the file is new
@@ -290,7 +290,7 @@ public class SyncInfoTree extends SyncInfoSet {
/**
* This is an internal method and is not intended to be invoked or
- * overriden by clients.
+ * overridden by clients.
*/
protected synchronized IResource[] internalGetOutOfSyncDescendants(IContainer resource) {
// The parent map contains a set of all out-of-sync children
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 807793002..1c3e7eca9 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
@@ -21,7 +21,7 @@ import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.core.*;
/**
- * An implemenation of <code>IResourceVariantTree</code> that provides the logic for
+ * An implementation of <code>IResourceVariantTree</code> that provides the logic for
* refreshing the tree and collecting the results so they can be cached locally.
* This class does not perform the caching but relies on subclasses to do that by
* overriding the <code>setVariant</code> method. The subclass
@@ -44,7 +44,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre
* @param depth the depth of the refresh (one of <code>IResource.DEPTH_ZERO</code>,
* <code>IResource.DEPTH_ONE</code>, or <code>IResource.DEPTH_INFINITE</code>)
* @param monitor a progress monitor
- * @return the array of resources whose corresponding varianst have changed
+ * @return the array of resources whose corresponding variants have changed
* @throws TeamException
*/
public IResource[] refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException {
@@ -69,7 +69,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre
* <li>pass the local resource and the resource variant handle to <code>collectChanges</code>
* </ol>
* Subclasses may override but should perform roughly the same steps.
- * @param resource the resoure being refreshed
+ * @param resource the resource being refreshed
* @param depth the depth of the refresh (one of <code>IResource.DEPTH_ZERO</code>,
* <code>IResource.DEPTH_ONE</code>, or <code>IResource.DEPTH_INFINITE</code>)
* @param monitor a progress monitor
@@ -129,8 +129,8 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre
/**
* Fetch the resource variant corresponding to the given resource. The depth
* parameter indicates the depth of the refresh operation and also indicates the
- * depth to which the resource variant's desendants will be traversed.
- * This method may prefetch the descendants to the provided depth
+ * depth to which the resource variant's descendants will be traversed.
+ * This method may pre-fetch the descendants to the provided depth
* or may just return the variant handle corresponding to the given
* local resource, in which case
* the descendant variants will be fetched by <code>fetchMembers(IResourceVariant, IProgressMonitor)</code>.
@@ -160,7 +160,7 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre
* variant. This method is invoked during change collection and should return whether
* the variant associated with the local resource has changed
* @param local the local resource
- * @param remote the newly fetched resoure variant
+ * @param remote the newly fetched resource variant
* @return <code>true</code> if the resource variant changed
* @throws TeamException
*/
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 dd009aaf0..3c895f2ab 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
@@ -190,7 +190,7 @@ public abstract class CachedResourceVariant extends PlatformObject implements IR
/**
* Get the path that uniquely identifies the remote resource
- * variant. This path descibes the remote location where
+ * variant. This path describes the remote location where
* the remote resource is stored and also uniquely identifies
* each resource variant. It is used to uniquely identify this
* resource variant when it is stored in the resource variant cache.
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 9dc23dea8..b1431e319 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
@@ -17,7 +17,7 @@ import org.eclipse.core.resources.IResource;
* and used by a <code>SyncInfo</code> to calculate the sync
* state of the workspace resources. Subscribers should provide a criteria
* best suited for their environment. For example, an FTP subscriber could choose to use file
- * size or file timestamps as comparison criterias whereas a CVS workspace subscriber would
+ * size or file timestamps as comparison criteria whereas a CVS workspace subscriber would
* use file revision numbers.
*
* @see org.eclipse.team.core.synchronize.SyncInfo
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java
index 74d035d38..51edc97fd 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/PersistantResourceVariantByteStore.java
@@ -23,7 +23,7 @@ import org.eclipse.team.internal.core.Assert;
/**
* A <code>ResourceVariantByteStore</code> that caches the variant bytes using
* the <code>org.eclipse.core.resources.ISynchronizer</code> so that
- * the tree is cached accross workbench invocations.
+ * the tree is cached across workbench invocations.
* <p>
* This class is not intended to be subclassed by clients.
*
@@ -36,7 +36,7 @@ public class PersistantResourceVariantByteStore extends ResourceVariantByteStore
private QualifiedName syncName;
/**
- * Create a persistant tree that uses the given qualified name
+ * Create a persistent tree that uses the given qualified name
* as the key in the <code>org.eclipse.core.resources.ISynchronizer</code>.
* It must be unique and should use the plugin as the local name
* and a unique id within the plugin as the qualifier name.
@@ -56,7 +56,7 @@ public class PersistantResourceVariantByteStore extends ResourceVariantByteStore
/**
* Return the qualified name that uniquely identifies this tree.
- * @return the qwualified name that uniquely identifies this tree.
+ * @return the qualified name that uniquely identifies this tree.
*/
public QualifiedName getSyncName() {
return syncName;
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 11dd67b1e..49796a8bc 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
@@ -20,7 +20,7 @@ import org.eclipse.team.core.TeamException;
* the synchronization bytes for the resource variants that represent
* a resource line-up of interest such as a version, baseline or branch. The
* cache stores bytes in order to minimize the memory footprint of the tree. It is the
- * reponsibility of the client of this API to cache enough bytes to meaningfully identify
+ * responsibility of the client of this API to cache enough bytes to meaningfully identify
* a resource variant (and possibly create an {@link IResourceVariant} handle from them).
* <p>
* The bytes for a resource variant are accessed using the local <code>IResource</code> handle
@@ -97,7 +97,7 @@ public abstract class ResourceVariantByteStore {
* Helper method to compare two byte arrays for equality
* @param syncBytes1 the first byte array or <code>null</code>
* @param syncBytes2 the second byte array or <code>null</code>
- * @return whetehr the two arrays are equal (i.e. same content)
+ * @return whether the two arrays are equal (i.e. same content)
*/
protected boolean equals(byte[] syncBytes1, byte[] syncBytes2) {
if (syncBytes1 == null) {
@@ -113,7 +113,7 @@ public abstract class ResourceVariantByteStore {
}
/**
- * Run the given action which may contain multiple modfications
+ * Run the given action which may contain multiple modifications
* to the byte store. By default, the action is run. Subclasses
* may override to obtain scheduling rules or batch deltas (if
* the byte store modifies workspace resources).
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTree.java
index bac414990..9e1e98120 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTree.java
@@ -32,7 +32,7 @@ public abstract class ResourceVariantTree extends AbstractResourceVariantTree {
/**
* Create a resource variant tree that uses the provided byte store to
* cache the resource variant bytes.
- * @param store the resource variant byte store used to cahe resource variants
+ * @param store the resource variant byte store used to cache resource variants
*/
protected ResourceVariantTree(ResourceVariantByteStore store) {
this.store = store;
@@ -79,7 +79,7 @@ public abstract class ResourceVariantTree extends AbstractResourceVariantTree {
* for the resource variants of this tree. A byte store is used
* to reduce the memory footprint of the tree.
* <p>
- * This method is not intended to be overriden by subclasses.
+ * This method is not intended to be overridden by subclasses.
*
* @return the resource variant tree that is being refreshed.
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
index 02fb3569d..6b95462f9 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java
@@ -62,7 +62,7 @@ public abstract class ResourceVariantTreeSubscriber extends Subscriber {
/**
* Method that creates an instance of SyncInfo for the provided local, base and remote
* resource variants.
- * Can be overiden by subclasses.
+ * Can be overridden by subclasses.
* @param local the local resource
* @param base the base resource variant or <code>null</code>
* @param remote the remote resource variant or <code>null</code>
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWayResourceComparator.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWayResourceComparator.java
index 891dc5e09..578d2dd29 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWayResourceComparator.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWayResourceComparator.java
@@ -49,7 +49,7 @@ public class ThreeWayResourceComparator implements IResourceVariantComparator {
if (local.getType() == IResource.FILE && getSynchronizer().isLocallyModified(local)) {
return false;
}
- // If there is no base, the local cannopt match the remote
+ // If there is no base, the local cannot match the remote
if (getSynchronizer().getBaseBytes(local) == null) return false;
// Otherwise, assume they are the same if the remote equals the base
return equals(getSynchronizer().getBaseBytes(local), getBytes(remote));
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java
index 596abc865..914cbd8d0 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySubscriber.java
@@ -42,7 +42,7 @@ public abstract class ThreeWaySubscriber extends ResourceVariantTreeSubscriber i
/**
* Create a three-way subscriber that uses the given synchronizer
- * to manage the synchronization state of local resoures
+ * to manage the synchronization state of local resources
* and their variants
* @param synchronizer the three-way synchronizer for this subscriber
*/
@@ -101,8 +101,8 @@ public abstract class ThreeWaySubscriber extends ResourceVariantTreeSubscriber i
}
/**
- * Return the three-way sychronizer of this subscriber.
- * @return the three-way sychronizer of this subscriber.
+ * Return the three-way synchronizer of this subscriber.
+ * @return the three-way synchronizer of this subscriber.
*/
public ThreeWaySynchronizer getSynchronizer() {
return synchronizer;
@@ -114,7 +114,7 @@ public abstract class ThreeWaySubscriber extends ResourceVariantTreeSubscriber i
* from a call to <code>IResourceVariant#asBytes()</code>.
* @param resource the local resource
* @param bytes the bytes that identify a variant of the resource
- * @return the resouce variant handle recreated from the bytes
+ * @return the resource variant handle recreated from the bytes
* @throws TeamException
*/
public abstract IResourceVariant getResourceVariant(IResource resource, byte[] bytes) throws TeamException;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
index 5d9f5b71b..dccc4b587 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/ThreeWaySynchronizer.java
@@ -58,10 +58,10 @@ public class ThreeWaySynchronizer implements IFlushOperation {
private Set listeners = new HashSet();
/**
- * Create a three-way synchronizer that uses a persistant
+ * Create a three-way synchronizer that uses a persistent
* byte store with the given qualified name as its unique
* identifier.
- * @param name the unique identifier for the persistant store
+ * @param name the unique identifier for the persistent store
*/
public ThreeWaySynchronizer(QualifiedName name) {
this(new PersistantResourceVariantByteStore(name));
@@ -306,7 +306,7 @@ public class ThreeWaySynchronizer implements IFlushOperation {
* Mark the resource as being ignored. Ignored resources
* are not returned by the <code>members</code> method,
* are never dirty (see <code>isLocallyModified</code>) and
- * do not have base or remote bytes cahced for them.
+ * do not have base or remote bytes cached for them.
* @param resource the resource to be ignored
* @throws TeamException
*/
@@ -484,7 +484,7 @@ public class ThreeWaySynchronizer implements IFlushOperation {
// Do not try to acquire the lock if the resources tree is locked
// The reason for this is that during the resource delta phase (i.e. when the tree is locked)
// the workspace lock is held. If we obtain our lock, there is
- // a chance of dealock. It is OK if we don't as we are still protected
+ // a chance of deadlock. It is OK if we don't as we are still protected
// by scheduling rules and the workspace lock.
if (ResourcesPlugin.getWorkspace().isTreeLocked()) return;
lock.acquire();
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
index d30379ae1..c624ed8f3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/FileContentManager.java
@@ -195,6 +195,7 @@ public class FileContentManager implements IFileContentManager {
}
public IStringMapping[] getDefaultNameMappings() {
+ // TODO: There is currently no extension point for this
return new IStringMapping[0];//getStringMappings(fPluginNameMappings.referenceMap());
}

Back to the top