Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2009-10-09 07:34:12 +0000
committerTomasz Zarna2009-10-09 07:34:12 +0000
commit773c2b09169820755799ca646f35dc1fbd06748e (patch)
tree90438f393f71e233a01c31e1ff4b911fcfdee333
parent9859e518b151c2fe9f649fc4f1c7657a1742d9f7 (diff)
downloadeclipse.platform.team-773c2b09169820755799ca646f35dc1fbd06748e.tar.gz
eclipse.platform.team-773c2b09169820755799ca646f35dc1fbd06748e.tar.xz
eclipse.platform.team-773c2b09169820755799ca646f35dc1fbd06748e.zip
Typos fixed.
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java8
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java12
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java22
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java4
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryRoot.java11
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java4
8 files changed, 34 insertions, 43 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java
index 16bc6d350..d549dc1c9 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -80,7 +80,7 @@ public class ResourceVariantCacheEntry {
* the contents from the first write is used and the content from subsequent writes is ignored.
* @param stream an InputStream that provides the contents to be cached
* @param monitor a progress monitor
- * @throws TeamException if the entry is DISPOSED or an I/O error occurres
+ * @throws TeamException if the entry is DISPOSED or an I/O error occurred
*/
public void setContents(InputStream stream, IProgressMonitor monitor) throws TeamException {
// Use a lock to only allow one write at a time
@@ -184,7 +184,7 @@ public class ResourceVariantCacheEntry {
/**
* Registers a hit on this cache entry. This updates the last access timestamp.
- * Thsi method is intended to only be invokded from inside this class or the cahce itself.
+ * This method is intended to only be invoked from inside this class or the cache itself.
* Other clients should not use it.
*/
protected void registerHit() {
@@ -192,7 +192,7 @@ public class ResourceVariantCacheEntry {
}
public void dispose() {
- // Use a lock to avoid changing state while another thread may be writting
+ // Use a lock to avoid changing state while another thread may be writing
beginOperation();
try {
state = DISPOSED;
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 5be340a42..d6bba4f7b 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -492,12 +492,12 @@ public class CVSTeamProvider extends RepositoryProvider {
* Checkout (cvs edit) the provided resources so they can be modified locally and committed.
* This will make any read-only resources in the list writable and will notify the server
* that the file is being edited. This notification may be done immediately or at some
- * later point depending on whether contact with the server is possble at the time of
+ * later point depending on whether contact with the server is possible at the time of
* invocation or the value of the notify server parameter.
*
* The recurse parameter is equivalent to the cvs local options -l (<code>true</code>) and
* -R (<code>false</code>). The notifyServer parameter can be used to defer server contact
- * until the next command. This may be approrpiate if no shell or progress monitor is available
+ * until the next command. This may be appropriate if no shell or progress monitor is available
* to the caller. The notification bit field indicates what temporary watches are to be used while
* the file is being edited. The possible values that can be ORed together are ICVSFile.EDIT,
* ICVSFile.UNEDIT and ICVSFile.COMMIT. There pre-ORed convenience values ICVSFile.NO_NOTIFICATION
@@ -538,15 +538,15 @@ public class CVSTeamProvider extends RepositoryProvider {
}
/**
- * Unedit the given resources. Any writtable resources will be reverted to their base contents
+ * Unedit the given resources. Any writable resources will be reverted to their base contents
* and made read-only and the server will be notified that the file is no longer being edited.
* This notification may be done immediately or at some
- * later point depending on whether contact with the server is possble at the time of
+ * later point depending on whether contact with the server is possible at the time of
* invocation or the value of the notify server parameter.
*
* The recurse parameter is equivalent to the cvs local options -l (<code>true</code>) and
* -R (<code>false</code>). The notifyServer parameter can be used to defer server contact
- * until the next command. This may be approrpiate if no shell or progress monitor is available
+ * until the next command. This may be appropriate if no shell or progress monitor is available
* to the caller.
*
* @param resources the resources to be unedited
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
index 320330596..7897e831c 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,9 +10,7 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.core.resources;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
@@ -25,7 +23,7 @@ import org.eclipse.team.internal.ccvs.core.util.Util;
/**
* Fetch the children for the given parent folder. When fetchMembers is invoked,
- * the children of the folder will be fecthced from the server and assigned to
+ * the children of the folder will be fetched from the server and assigned to
* the children of the parent folder.
*/
public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatusListener {
@@ -155,7 +153,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
throw new CVSException(notExistStatus);
}
- // Report any internal exceptions that occured fetching the members
+ // Report any internal exceptions that occurred fetching the members
if ( ! exceptions.isEmpty()) {
if (exceptions.size() == 1) {
throw (CVSException)exceptions.get(0);
@@ -237,7 +235,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
}
/**
- * This method is invoked for each child folder as the reponses are being recieved from
+ * This method is invoked for each child folder as the responses are being received from
* the server. Default behavior is to record the folder for later retrieval using <code>getChilren()</code>.
* Subclasses may override but should invoke the inherited method to ensure the folder gets recorded.
* @param name the name of the child folder
@@ -253,10 +251,10 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
}
/**
- * This method is invoked for each child file as the reponses are being recieved from
+ * This method is invoked for each child file as the responses are being received from
* the server. Default behavior is to record the file for later retrieval using <code>getChildren()</code>.
* Subclasses may override but should invoke the inherited method to ensure the file gets recorded.
- * This is important because the file revisions for any files are fetched subsequent to the fecthing
+ * This is important because the file revisions for any files are fetched subsequent to the fetching
* of the children.
* @param name the name of the child folder
*/
@@ -273,7 +271,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
}
/**
- * This method is invoked to indicate that the parent beig queried for children
+ * This method is invoked to indicate that the parent being queried for children
* does not exist. Subclasses may override to get early notification of this but
* should still invoke the inherited method.
*/
@@ -283,7 +281,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
/**
* Update the parent folder such that it's children are the
- * children that have been fecthed by the reciever.
+ * children that have been fetched by the receiver.
*/
protected void updateParentFolderChildren() {
parentFolder.setChildren(getFetchedChildren());
@@ -298,7 +296,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
}
/**
- * Return an array of all fecthed children.
+ * Return an array of all fetched children.
* @return
*/
public ICVSRemoteResource[] getFetchedChildren() {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
index 35935070f..142200bd2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
@@ -61,7 +61,7 @@ public class ResourceSyncInfo {
private static final String LOCKEDBY_SUFFIX = "\tlocked by"; //$NON-NLS-1$
// a sync element with a revision of '0' is considered a new file that has
- // not been comitted to the repo. Is visible so that clients can create sync infos
+ // not been committed to the repo. Is visible so that clients can create sync infos
// for new files.
public static final String ADDED_REVISION = "0"; //$NON-NLS-1$
@@ -196,7 +196,7 @@ public class ResourceSyncInfo {
/**
* Answers if this sync information is for a file that is scheduled to be deleted
- * from the repository but the deletion has not yet been comitted.
+ * from the repository but the deletion has not yet been committed.
*
* @return <code>true</code> if the sync information is deleted or <code>false</code> if
* the sync is for an file that exists remotely.
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java
index c64b54008..31a925b73 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileWriter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -50,14 +50,14 @@ public class SyncFileWriter {
public static final String IGNORE_FILE = ".cvsignore"; //$NON-NLS-1$
// Some older CVS clients may of added a line to the entries file consisting
- // of only a 'D'. It is safe to ingnore these entries.
+ // of only a 'D'. It is safe to ignore these entries.
private static final String FOLDER_TAG="D"; //$NON-NLS-1$
// Command characters found in the Entries.log file
private static final String ADD_TAG="A "; //$NON-NLS-1$
private static final String REMOVE_TAG="R "; //$NON-NLS-1$
- // key for saving the mod stamp for each writen meta file
+ // key for saving the mod stamp for each written meta file
public static final QualifiedName MODSTAMP_KEY = new QualifiedName("org.eclipse.team.cvs.core", "meta-file-modtime"); //$NON-NLS-1$ //$NON-NLS-2$
/**
@@ -246,7 +246,7 @@ public class SyncFileWriter {
// write CVS/Entries.Static
IFile staticFile = cvsSubDir.getFile(STATIC);
if(info.getIsStatic()) {
- // the existance of the file is all that matters
+ // the existence of the file is all that matters
if (Policy.DEBUG_METAFILE_CHANGES) {
System.out.println("Writing Static file for " + folder.getFullPath()); //$NON-NLS-1$
}
@@ -304,7 +304,7 @@ public class SyncFileWriter {
}
/**
- * Delete folder sync is equilavent to removing the CVS subdir.
+ * Delete folder sync is equivalent to removing the CVS subdir.
*/
public static void deleteFolderSync(IContainer folder) throws CVSException {
try {
@@ -357,7 +357,7 @@ public class SyncFileWriter {
public static void writeAllNotifyInfo(IContainer parent, NotifyInfo[] infos) throws CVSException {
// get the CVS directory
IFolder cvsSubDir = getCVSSubdirectory(parent);
- // write lines will throw an exception if the CVS directoru does not exist
+ // write lines will throw an exception if the CVS directory does not exist
if (infos.length == 0) {
// if there are no notify entries, delete the notify file
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java
index 2efc16590..89712593a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSModelElement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -85,7 +85,7 @@ public abstract class CVSModelElement implements IWorkbenchAdapter, IAdaptable {
}
/**
- * Helper methed error handler that displayes a generic dialog title and message when displaying an error to the user.
+ * Helper method error handler that displays a generic dialog title and message when displaying an error to the user.
* @param t the exception that occurred.
*/
protected void handle(Throwable t) {
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 8b2c1c3b0..1ffc3dc1e 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
@@ -12,14 +12,7 @@ package org.eclipse.team.internal.ccvs.ui.repo;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
@@ -47,7 +40,7 @@ public class RepositoryRoot extends PlatformObject {
// Map of String (module name) -> ICVSRemoteFolder (that is a defined module)
Map modulesCache;
Object modulesCacheLock = new Object();
- // Lis of date tags
+ // List of date tags
List dateTags = new ArrayList();
public static class TagCacheEntry {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java
index 19fe129ea..78904b7b6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSourceResourceAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,7 +56,7 @@ public class TagSourceResourceAdapter implements IAdaptable, IWorkbenchAdapter {
* @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
*/
public ImageDescriptor getImageDescriptor(Object object) {
- // No imgae descriptor
+ // No image descriptor
return null;
}

Back to the top